From 6ac23654a547ed5f9d617dadf02615e710263b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 13 Nov 2023 21:45:28 +0100 Subject: [PATCH] refactor manifest types, part 1 --- .../.github/CONTRIBUTING.md | 2 +- .../src/external-login-providers/manifests.ts | 4 +- .../create-extension-api.function.ts | 33 +- .../functions/load-extension-api.function.ts | 7 +- .../load-extension-element.function.ts | 2 + .../functions/load-extension.function.ts | 2 + .../functions/manifest-api-loader.function.ts | 31 ++ .../manifest-element-loader.function.ts | 31 ++ .../src/libs/extension-api/index.ts | 4 +- .../extension-api/models/api.interface.ts | 3 + .../src/libs/extension-api/models/index.ts | 1 + .../registry/extension.registry.test.ts | 12 +- .../libs/extension-api/type-guards/index.ts | 2 +- .../is-manifest-element-name-type.function.ts | 2 +- .../src/libs/extension-api/types.ts | 299 ------------------ .../libs/extension-api/types/base.types.ts | 125 ++++++++ .../extension-api/types/condition.types.ts | 28 ++ .../src/libs/extension-api/types/index.ts | 8 + .../types/manifest-base.interface.ts | 29 ++ .../types/manifest-bundle.interface.ts | 11 + .../types/manifest-condition.interface.ts | 9 + .../types/manifest-entrypoint.interface.ts | 10 + .../types/manifest-kind.interface.ts | 8 + .../src/libs/extension-api/types/map.types.ts | 12 + .../src/libs/extension-api/types/utils.ts | 71 +++++ .../src/packages/core/debug/manifests.ts | 2 +- .../models/collection-view.model.ts | 5 +- .../models/localization.model.ts | 4 +- .../models/workspace.model.ts | 5 +- .../packages/core/localization/manifests.ts | 4 +- .../packages/core/modal/common/manifests.ts | 20 +- .../core/property-action/manifests.ts | 4 +- .../config/block-configuration/manifests.ts | 2 +- .../config/group-configuration/manifests.ts | 2 +- .../config/stylesheet-picker/manifests.ts | 2 +- .../uis/block-grid/manifests.ts | 2 +- .../config/block-configuration/manifests.ts | 2 +- .../uis/block-list/manifests.ts | 2 +- .../uis/checkbox-list/manifests.ts | 2 +- .../bulk-action-permissions/manifests.ts | 2 +- .../config/column-configuration/manifests.ts | 2 +- .../config/layout-configuration/manifests.ts | 2 +- .../config/order-by/manifests.ts | 2 +- .../uis/collection-view/manifests.ts | 2 +- .../uis/color-picker/manifests.ts | 2 +- .../uis/date-picker/manifests.ts | 2 +- .../property-editor/uis/dropdown/manifests.ts | 2 +- .../uis/eye-dropper/manifests.ts | 2 +- .../uis/icon-picker/manifests.ts | 2 +- .../uis/image-cropper/manifests.ts | 2 +- .../image-crops-configuration/manifests.ts | 2 +- .../property-editor/uis/label/manifests.ts | 2 +- .../core/property-editor/uis/manifests.ts | 2 +- .../uis/markdown-editor/manifests.ts | 2 +- .../uis/media-picker/manifests.ts | 2 +- .../uis/member-group-picker/manifests.ts | 2 +- .../uis/member-picker/manifests.ts | 2 +- .../uis/multi-url-picker/manifests.ts | 2 +- .../uis/multiple-text-string/manifests.ts | 2 +- .../uis/number-range/manifests.ts | 2 +- .../property-editor/uis/number/manifests.ts | 4 +- .../uis/order-direction/manifests.ts | 2 +- .../uis/overlay-size/manifests.ts | 2 +- .../uis/radio-button-list/manifests.ts | 2 +- .../property-editor/uis/slider/manifests.ts | 2 +- .../property-editor/uis/text-box/manifests.ts | 4 +- .../property-editor/uis/textarea/manifests.ts | 2 +- .../uis/tiny-mce/config/manifests.ts | 8 +- .../property-editor/uis/tiny-mce/manifests.ts | 2 +- .../uis/tiny-mce/plugins/manifests.ts | 10 +- .../property-editor/uis/toggle/manifests.ts | 2 +- .../config/start-node/manifests.ts | 2 +- .../uis/tree-picker/manifests.ts | 2 +- .../uis/upload-field/manifests.ts | 2 +- .../uis/user-picker/manifests.ts | 2 +- .../uis/value-type/manifests.ts | 2 +- .../src/packages/core/themes/manifests.ts | 2 +- .../src/packages/core/umbraco-package.ts | 2 +- .../workspace/workspace-modal/manifests.ts | 2 +- .../dictionary/entity-actions/manifests.ts | 6 +- .../dictionary/menu-item/manifests.ts | 2 +- .../dictionary/workspace/manifests.ts | 4 +- .../packages/dictionary/section.manifest.ts | 2 +- .../packages/dictionary/umbraco-package.ts | 2 +- .../documents/dashboards/manifests.ts | 2 +- .../workspace/manifests.ts | 2 +- .../entity-actions/create/manifests.ts | 2 +- .../document-types/workspace/manifests.ts | 10 +- .../documents/collection/manifests.ts | 9 +- .../entity-actions/create/manifests.ts | 2 +- .../entity-actions/permissions/manifests.ts | 2 +- .../documents/menu-item/manifests.ts | 2 +- .../document-picker/manifests.ts | 2 +- .../documents/documents/tree/manifests.ts | 2 +- .../workspace/document-workspace.element.ts | 5 +- .../documents/workspace/manifests.ts | 24 +- .../src/packages/documents/umbraco-package.ts | 2 +- .../src/packages/health-check/manifests.ts | 2 +- .../packages/health-check/umbraco-package.ts | 2 +- .../packages/log-viewer/umbraco-package.ts | 2 +- .../workspace/logviewer/manifests.ts | 8 +- .../media/media-types/workspace/manifests.ts | 8 +- .../media/media/collection-view/manifests.ts | 27 +- .../media/media/menu-item/manifests.ts | 2 +- .../media/media/workspace/manifests.ts | 6 +- .../src/packages/media/umbraco-package.ts | 2 +- .../member-groups/workspace/manifests.ts | 4 +- .../member-types/workspace/manifests.ts | 2 +- .../members/members/workspace/manifests.ts | 2 +- .../src/packages/members/section.manifests.ts | 2 +- .../src/packages/members/umbraco-package.ts | 2 +- .../packages/package-builder/manifests.ts | 2 +- .../packages/package-repo/manifests.ts | 2 +- .../packages/package-section/manifests.ts | 6 +- .../src/packages/packages/umbraco-package.ts | 2 +- .../src/packages/search/manifests.ts | 8 +- .../src/packages/search/umbraco-package.ts | 2 +- .../packages/settings/dashboards/manifests.ts | 10 +- .../entity-actions/create/manifests.ts | 2 +- .../settings/data-types/modals/manifests.ts | 6 +- .../data-types/workspace/manifests.ts | 6 +- .../extensions/workspace/manifests.ts | 2 +- .../app-language-select/manifests.ts | 4 +- .../settings/languages/modals/manifests.ts | 2 +- .../workspace/language-root/manifests.ts | 2 +- .../languages/workspace/language/manifests.ts | 4 +- .../relation-types/workspace/manifests.ts | 6 +- .../src/packages/settings/umbraco-package.ts | 2 +- .../tags/config/storage-type/manifests.ts | 2 +- .../tags/property-editors/tags/manifests.ts | 2 +- .../src/packages/tags/umbraco-package.ts | 2 +- .../packages/templating/modals/manifests.ts | 6 +- .../partial-views/entity-actions/manifests.ts | 2 +- .../partial-views/workspace/manifests.ts | 2 +- .../templating/scripts/workspace/manifests.ts | 2 +- .../stylesheets/workspace/manifests.ts | 6 +- .../templating/templates/modals/manifests.ts | 2 +- .../templates/workspace/manifests.ts | 2 +- .../packages/templating/umbraco-package.ts | 2 +- .../src/packages/umbraco-news/manifests.ts | 2 +- .../packages/umbraco-news/umbraco-package.ts | 2 +- .../packages/user/current-user/manifests.ts | 4 +- .../user/current-user/modals/manifests.ts | 2 +- .../user-profile-apps/manifests.ts | 8 +- .../src/packages/user/modals/manifests.ts | 2 +- .../src/packages/user/umbraco-package.ts | 2 +- .../user/user-group/modals/manifests.ts | 2 +- .../user/user-group/section-view/manifests.ts | 2 +- .../user/user-group/workspace/manifests.ts | 2 +- .../user/user-permission/modals/manifests.ts | 2 +- .../user/user/collection/views/manifests.ts | 18 +- .../packages/user/user/modals/manifests.ts | 10 +- .../user/user/section-view/manifests.ts | 2 +- .../packages/user/user/workspace/manifests.ts | 2 +- 154 files changed, 660 insertions(+), 555 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/manifest-api-loader.function.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/manifest-element-loader.function.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/models/api.interface.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/base.types.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/condition.types.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-base.interface.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-bundle.interface.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-condition.interface.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-entrypoint.interface.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-kind.interface.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/map.types.ts create mode 100644 src/Umbraco.Web.UI.Client/src/libs/extension-api/types/utils.ts diff --git a/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md b/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md index 6a340b6392..7a6df560b5 100644 --- a/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md +++ b/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md @@ -115,7 +115,7 @@ To declare the Published Cache Status Dashboard as a new manifest, we need to ad alias: 'Umb.Dashboard.PublishedStatus', name: 'Published Status Dashboard', elementName: 'umb-dashboard-published-status', - loader: () => import('./published-status/dashboard-published-status.element.js'), + element: () => import('./published-status/dashboard-published-status.element.js'), weight: 200, meta: { label: 'Published Status', diff --git a/src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/manifests.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/manifests.ts index d3153587ae..534b6a9cc2 100644 --- a/src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/manifests.ts +++ b/src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/manifests.ts @@ -7,7 +7,7 @@ export const manifests: Array = [ alias: 'Umb.ExternalLoginProvider.Test', name: 'Test External Login Provider', elementName: 'umb-external-login-provider-test', - loader: () => import('./external-login-provider-test.element.js'), + element: () => import('./external-login-provider-test.element.js'), weight: 2, meta: { label: 'Test External Login Provider', @@ -19,7 +19,7 @@ export const manifests: Array = [ alias: 'Umb.ExternalLoginProvider.Test2', name: 'Test External Login Provider 2', elementName: 'umb-external-login-provider-test2', - loader: () => import('./external-login-provider-test2.element.js'), + element: () => import('./external-login-provider-test2.element.js'), weight: 1, meta: { label: 'Test External Login Provider 2', diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.function.ts index 0430f7fc84..741df6f23c 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.function.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/create-extension-api.function.ts @@ -1,32 +1,23 @@ -import { hasApiExport, hasDefaultExport, isManifestApiConstructorType } from '../type-guards/index.js'; -import type { ManifestApi, ClassConstructor, ManifestElementAndApi, UmbApi } from '../types.js'; -import { loadExtensionApi } from '../functions/load-extension-api.function.js'; +import { UmbApi } from '../models/api.interface.js'; +import type { ManifestApi } from '../types/index.js'; +import { loadManifestApiProperty } from './manifest-api-loader.function.js'; //TODO: Write tests for this method: export async function createExtensionApi( - manifest: ManifestApi | ManifestElementAndApi, + manifest: ManifestApi, constructorArguments: unknown[] = [] ): Promise { - const js = await loadExtensionApi(manifest); - if (isManifestApiConstructorType(manifest)) { - return new manifest.api(...constructorArguments); - } - - if (js) { - if (hasApiExport>(js)) { - return new js.api(...constructorArguments); + if(manifest.api) { + const api = await loadManifestApiProperty(manifest.api, constructorArguments); + if(api) { + return api; } - if (hasDefaultExport>(js)) { - return new js.default(...constructorArguments); + } else if (manifest.js) { + const js = await loadManifestApiProperty(manifest.js, constructorArguments); + if(js) { + return js; } - - console.error( - `-- Extension of alias "${manifest.alias}" did not succeed creating an api class instance, missing a 'api' or 'default' export of the served JavaScript file`, - manifest - ); - - return undefined; } console.error( diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension-api.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension-api.function.ts index c59e9eb13a..ce608e0d30 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension-api.function.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension-api.function.ts @@ -1,8 +1,11 @@ +import { UmbApi } from '../models/api.interface.js'; import { isManifestApiJSType, isManifestJSType, isManifestLoaderType } from '../type-guards/index.js'; -import type { ManifestWithLoader } from '../types.js'; +import type { ManifestApi } from '../types/index.js'; -export async function loadExtensionApi(manifest: ManifestWithLoader): Promise { +export async function loadExtensionApi(manifest: ManifestApi): Promise { try { + + // TODO: Get rid of this, instead make apiJs support loader. if (isManifestLoaderType(manifest)) { return manifest.loader(); } diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension-element.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension-element.function.ts index 78977ca073..1bd1775caa 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension-element.function.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension-element.function.ts @@ -3,6 +3,8 @@ import type { ManifestWithLoader } from '../types.js'; export async function loadExtensionElement(manifest: ManifestWithLoader): Promise { try { + + // TODO: Get rid of this, instead make elementJs support loader. if (isManifestLoaderType(manifest)) { return manifest.loader(); } diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension.function.ts index e478095073..b27348612e 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension.function.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/load-extension.function.ts @@ -3,6 +3,8 @@ import type { ManifestWithLoader } from '../types.js'; export async function loadExtension(manifest: ManifestWithLoader): Promise { try { + + // TODO: Get rid of this, instead make js support loader. if (isManifestLoaderType(manifest)) { return await manifest.loader(); } diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/manifest-api-loader.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/manifest-api-loader.function.ts new file mode 100644 index 0000000000..ae3c8fb6a0 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/manifest-api-loader.function.ts @@ -0,0 +1,31 @@ +import type { UmbApi } from "../models/api.interface.js"; +import type { ApiLoaderExports, ApiLoaderProperty, ClassConstructor } from "../types/utils.js"; + +export async function loadManifestApiProperty(property: ApiLoaderProperty, constructorArguments: unknown[] = []): Promise { + const propType = typeof property + if(propType === 'function') { + if(typeof property.constructor === 'function') { + // Class Constructor + return new (property as ClassConstructor)(constructorArguments); + } else { + // Promise function + const result = await (property as (Exclude, string>, ClassConstructor>))(); + if(typeof result === 'object' && result != null) { + const exportValue = 'api' in result ? result.api : undefined || 'default' in result ? result.default : undefined; + if(exportValue && typeof exportValue === 'function') { + return new exportValue(constructorArguments); + } + } + } + } else if(propType === 'string') { + // Import string + const result = await (import(/* @vite-ignore */ property as string) as unknown as ApiLoaderExports); + if(typeof result === 'object' && result != null) { + const exportValue = 'api' in result ? result.api : undefined || 'default' in result ? result.default : undefined; + if(exportValue && typeof exportValue === 'function') { + return new exportValue(constructorArguments); + } + } + } + return undefined; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/manifest-element-loader.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/manifest-element-loader.function.ts new file mode 100644 index 0000000000..9b1dcfa0a3 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/functions/manifest-element-loader.function.ts @@ -0,0 +1,31 @@ +import type { ClassConstructor, ElementLoaderExports, ElementLoaderProperty } from "../types/utils.js"; + + +export async function loadManifestElementProperty(property: ElementLoaderProperty): Promise { + const propType = typeof property + if(propType === 'function') { + if(typeof property.constructor === 'function') { + // Class Constructor + return new (property as ClassConstructor)(); + } else { + // Promise function + const result = await (property as (Exclude, ClassConstructor>))(); + if(typeof result === 'object' && result !== null) { + const exportValue = 'element' in result ? result.element : undefined || 'default' in result ? result.default : undefined; + if(exportValue && typeof exportValue === 'function') { + return new exportValue(); + } + } + } + } else if(propType === 'string') { + // Import string + const result = await (import(/* @vite-ignore */ property as string) as unknown as ElementLoaderExports); + if(typeof result === 'object' && result != null) { + const exportValue = 'element' in result ? result.element : undefined || 'default' in result ? result.default : undefined; + if(exportValue && typeof exportValue === 'function') { + return new exportValue(); + } + } + } + return undefined; +} diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/index.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/index.ts index 84366ec12c..c8ce6b7200 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/index.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/index.ts @@ -1,8 +1,8 @@ -export * from './initializers/index.js'; export * from './condition/index.js'; export * from './controller/index.js'; export * from './functions/index.js'; +export * from './initializers/index.js'; export * from './models/index.js'; export * from './registry/extension.registry.js'; export * from './type-guards/index.js'; -export * from './types.js'; +export * from './types/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/models/api.interface.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/models/api.interface.ts new file mode 100644 index 0000000000..895fd43f69 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/models/api.interface.ts @@ -0,0 +1,3 @@ +export interface UmbApi { + destroy?(): void; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/models/index.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/models/index.ts index 09ef59f5ac..643057374c 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/models/index.ts @@ -1 +1,2 @@ export * from './entry-point.interface.js' +export * from './api.interface.js' diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.test.ts index a7f5b534db..b0492dc21c 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.test.ts @@ -1,10 +1,14 @@ import { expect } from '@open-wc/testing'; -import type { ManifestElementWithElementName, ManifestKind, ManifestWithMeta } from '../types.js'; +import type { ManifestElementWithElementName, ManifestKind, ManifestBase } from '../types/index.js'; import { UmbExtensionRegistry } from './extension.registry.js'; +interface TestManifestWithMeta extends ManifestBase { + meta: unknown; +} + describe('UmbExtensionRegistry', () => { - let extensionRegistry: UmbExtensionRegistry; - let manifests: Array; + let extensionRegistry: UmbExtensionRegistry; + let manifests: Array; beforeEach(() => { extensionRegistry = new UmbExtensionRegistry(); @@ -170,7 +174,7 @@ describe('UmbExtensionRegistry', () => { describe('UmbExtensionRegistry with kinds', () => { let extensionRegistry: UmbExtensionRegistry; let manifests: Array< - ManifestElementWithElementName | ManifestWithMeta | ManifestKind + ManifestElementWithElementName | TestManifestWithMeta | ManifestKind >; beforeEach(() => { diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/index.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/index.ts index e435f99db2..6787c909c7 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/index.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/index.ts @@ -8,4 +8,4 @@ export * from './is-manifest-api-js-type.function.js'; export * from './is-manifest-loader-type.function.js'; export * from './has-default-export.function.js'; export * from './has-element-export.function.js'; -export * from './has-api-export.function.js'; +export * from './has-api-export.function.js'; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/is-manifest-element-name-type.function.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/is-manifest-element-name-type.function.ts index 9c02956850..f59f6249e9 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/is-manifest-element-name-type.function.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/type-guards/is-manifest-element-name-type.function.ts @@ -1,4 +1,4 @@ -import type { ManifestElement, ManifestElementWithElementName } from '../types.js'; +import type { ManifestElement, ManifestElementWithElementName } from '../types/index.js'; export function isManifestElementNameType(manifest: unknown): manifest is ManifestElementWithElementName { return typeof manifest === 'object' && manifest !== null && (manifest as ManifestElement).elementName !== undefined; diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts deleted file mode 100644 index c073a422db..0000000000 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types.ts +++ /dev/null @@ -1,299 +0,0 @@ -import type { UmbExtensionCondition } from './condition/index.js'; -import type { UmbEntryPointModule } from './models/index.js'; - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export type HTMLElementConstructor = new (...args: any[]) => T; - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export type ClassConstructor = new (...args: any[]) => T; - -export type ManifestTypeMap = { - [Manifest in ManifestTypes as Manifest['type']]: Manifest; -} & { - [key: string]: ManifestBase; -}; - -export type SpecificManifestTypeOrManifestBase< - ManifestTypes extends ManifestBase, - T extends keyof ManifestTypeMap | string -> = T extends keyof ManifestTypeMap ? ManifestTypeMap[T] : ManifestBase; - -export interface ManifestBase { - /** - * The type of extension such as dashboard etc... - */ - type: string; - - /** - * The alias of the extension, ensure it is unique - */ - alias: string; - - /** - * The kind of the extension, used to group extensions together - * - * @examples ["button"] - */ - kind?: unknown; // I had to add the optional kind property set to undefined. To make the ManifestTypes recognize the Manifest Kind types. Notice that Kinds has to Omit the kind property when extending. - - /** - * The friendly name of the extension - */ - name: string; - - /** - * Extensions such as dashboards are ordered by weight with lower numbers being first in the list - */ - weight?: number; -} - -export interface ManifestKind { - type: 'kind'; - alias: string; - matchType: string; - matchKind: string; - manifest: Partial; -} - -// TODO: Get rid of this type and implements ManifestWithDynamicConditions instead. -export interface ManifestWithConditions { - /** - * Set the conditions for when the extension should be loaded - */ - conditions: ConditionType; -} - -export interface UmbConditionConfigBase { - alias: AliasType; -} - -export type ConditionTypeMap = { - [Condition in ConditionTypes as Condition['alias']]: Condition; -} & { - [key: string]: UmbConditionConfigBase; -}; - -export type SpecificConditionTypeOrUmbConditionConfigBase< - ConditionTypes extends UmbConditionConfigBase, - T extends keyof ConditionTypeMap | string -> = T extends keyof ConditionTypeMap ? ConditionTypeMap[T] : UmbConditionConfigBase; - -export interface ManifestWithDynamicConditions - extends ManifestBase { - /** - * Set the conditions for when the extension should be loaded - */ - conditions?: Array; - /** - * Define one or more extension aliases that this extension should overwrite. - */ - overwrites?: string | Array; -} - -export interface ManifestWithLoader extends ManifestBase { - /** - * @TJS-ignore - */ - loader?(): Promise; -} - -// TODO: Rename this to something more descriptive: -export interface UmbApi { - destroy?(): void; -} - -/** - * The type of extension such as dashboard etc... - */ -export interface ManifestApi - extends ManifestWithLoader<{ default: ClassConstructor } | { api: ClassConstructor }> { - /** - * @TJS-ignore - */ - readonly API_TYPE?: ApiType; - - /** - * The file location of the javascript file to load - * @TJS-required - */ - js?: string; - - /** - * @TJS-ignore - */ - apiName?: string; - - /** - * @TJS-ignore - */ - api?: ClassConstructor; -} - -export interface ManifestWithLoaderIncludingDefaultExport - extends ManifestWithLoader<{ default: T } | { element: T } | Omit> { - /** - * The file location of the javascript file to load - */ - js?: string; -} - -export interface ManifestWithLoaderIncludingApiExport - extends ManifestWithLoader<{ api: ApiType } | Omit> { - /** - * The file location of the javascript file to load - */ - js?: string; - /** - * The file location of the API javascript file to load - */ - apiJs?: string; -} - -export interface ManifestWithLoaderIncludingElementExport - extends ManifestWithLoader<{ element: ElementType } | Omit> { - /** - * The file location of the javascript file to load - */ - js?: string; - /** - * The file location of the element javascript file to load - */ - elementJs?: string; -} -export interface ManifestWithLoaderOptionalApiOrElementExport< - ElementType extends HTMLElement = HTMLElement, - ApiType extends UmbApi = UmbApi, - ClassType = { element: ElementType } | { api: ApiType } | { element: ElementType, api: ApiType } | Omit, 'api'> -> -extends ManifestWithLoader { - /** - * The file location of the javascript file to load - */ - js?: string; - /** - * The file location of the element javascript file to load - */ - elementJs?: string; - /** - * The file location of the API javascript file to load - */ - apiJs?: string; -} - -export interface ManifestElement - extends ManifestWithLoader<{ default: ClassConstructor } | Omit> { - /** - * @TJS-ignore - */ - readonly ELEMENT_TYPE?: ElementType; - - /** - * The file location of the javascript file to load - * - * @TJS-require - */ - js?: string; - - /** - * The HTML web component name to use such as 'my-dashboard' - * Note it is NOT , just the element name. - */ - elementName?: string; - - /** - * This contains properties specific to the type of extension - */ - meta?: unknown; -} - -export interface ManifestElementAndApi - extends ManifestWithLoaderOptionalApiOrElementExport { - /** - * @TJS-ignore - */ - readonly API_TYPE?: ApiType; - /** - * @TJS-ignore - */ - readonly ELEMENT_TYPE?: ElementType; - - - /** - * @TJS-ignore - */ - apiName?: string; - - /** - * @TJS-ignore - */ - api?: ClassConstructor; - - /** - * The HTML web component name to use such as 'my-dashboard' - * Note it is NOT , just the element name. - */ - elementName?: string; -} - -export interface ManifestWithView extends ManifestElement { - meta: MetaManifestWithView; -} - -export interface MetaManifestWithView { - pathname: string; - label: string; - icon: string; -} - -export interface ManifestElementWithElementName extends ManifestElement { - /** - * The HTML web component name to use such as 'my-dashboard' - * Note it is NOT but just the name - */ - elementName: string; -} - -export interface ManifestWithMeta extends ManifestBase { - /** - * This contains properties specific to the type of extension - */ - meta: unknown; -} - -/** - * This type of extension gives full control and will simply load the specified JS file - * You could have custom logic to decide which extensions to load/register by using extensionRegistry - */ -export interface ManifestEntryPoint extends ManifestWithLoader { - type: 'entryPoint'; - - /** - * The file location of the javascript file to load in the backoffice - */ - js?: string; -} - -/** - * This type of extension takes a JS module and registers all exported manifests from the pointed JS file. - */ -export interface ManifestBundle - extends ManifestWithLoader<{ [key: string]: Array }> { - type: 'bundle'; - - /** - * The file location of the javascript file to load in the backoffice - */ - js?: string; -} - -/** - * This type of extension takes a JS module and registers all exported manifests from the pointed JS file. - */ -export interface ManifestCondition extends ManifestApi { - type: 'condition'; - - /** - * The file location of the javascript file to load in the backoffice - */ - js?: string; -} diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/base.types.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/base.types.ts new file mode 100644 index 0000000000..4b61b8d62a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/base.types.ts @@ -0,0 +1,125 @@ +import type { UmbApi } from "../models/index.js"; +import type { ManifestBase } from "./manifest-base.interface.js"; +import type { ApiLoaderProperty, ClassConstructor, ElementAndApiLoaderProperty, ElementLoaderProperty } from "./utils.js"; + + + + +export interface ManifestWithView extends ManifestElement { + meta: MetaManifestWithView; +} + +export interface MetaManifestWithView { + pathname: string; + label: string; + icon: string; +} + +export interface ManifestElementWithElementName extends ManifestElement { + /** + * The HTML web component name to use such as 'my-dashboard' + * Note it is NOT but just the name + */ + elementName: string; +} + + + + +export interface ManifestPlainJs extends ManifestBase { + /** + * The file location of the javascript file to load + * @TJS-type string + */ + js?: string | Promise<{ default: ClassConstructor }> | ClassConstructor; +} + +/** + * The type of extension such as dashboard etc... + */ +export interface ManifestApi extends ManifestBase { + /** + * @TJS-ignore + */ + readonly API_TYPE?: ApiType; + + /** + * The file location of the javascript file to load + * @TJS-type string + */ + js?: ApiLoaderProperty; + + /** + * @TJS-ignore + */ + api?: ApiLoaderProperty; + +} + + +export interface ManifestElement extends ManifestBase { + /** + * @TJS-ignore + */ + readonly ELEMENT_TYPE?: ElementType; + + /** + * The file location of the javascript file to load + * @TJS-type string + */ + js?: ElementLoaderProperty; + + /** + * The file location of the element javascript file to load + * @TJS-type string + */ + element?: ElementLoaderProperty; + + /** + * The HTML web component name to use such as 'my-dashboard' + * Note it is NOT , just the element name. + */ + elementName?: string; + + /** + * This contains properties specific to the type of extension + */ + meta?: unknown; +} + +export interface ManifestElementAndApi extends ManifestBase { + /** + * @TJS-ignore + */ + readonly API_TYPE?: ApiType; + /** + * @TJS-ignore + */ + readonly ELEMENT_TYPE?: ElementType; + + + + /** + * The file location of the javascript file to load + * @TJS-type string + */ + js?: ElementAndApiLoaderProperty; + + /** + * The file location of the api javascript file to load + * @TJS-type string + */ + api?: ApiLoaderProperty; + + /** + * The file location of the element javascript file to load + * @TJS-type string + */ + element?: ElementLoaderProperty; + + /** + * The HTML web component name to use such as 'my-dashboard' + * Note it is NOT , just the element name. + */ + elementName?: string; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/condition.types.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/condition.types.ts new file mode 100644 index 0000000000..a09b527510 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/condition.types.ts @@ -0,0 +1,28 @@ +import type { ManifestBase } from "./manifest-base.interface.js"; + +export interface UmbConditionConfigBase { + alias: AliasType; +} + +export type ConditionTypeMap = { + [Condition in ConditionTypes as Condition['alias']]: Condition; +} & { + [key: string]: UmbConditionConfigBase; +}; + +export type SpecificConditionTypeOrUmbConditionConfigBase< + ConditionTypes extends UmbConditionConfigBase, + T extends keyof ConditionTypeMap | string +> = T extends keyof ConditionTypeMap ? ConditionTypeMap[T] : UmbConditionConfigBase; + +export interface ManifestWithDynamicConditions + extends ManifestBase { + /** + * Set the conditions for when the extension should be loaded + */ + conditions?: Array; + /** + * Define one or more extension aliases that this extension should overwrite. + */ + overwrites?: string | Array; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/index.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/index.ts new file mode 100644 index 0000000000..14b601b5ce --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/index.ts @@ -0,0 +1,8 @@ +export * from './base.types.js'; +export * from './condition.types.js'; +export * from './manifest-base.interface.js'; +export * from './manifest-bundle.interface.js'; +export * from './manifest-condition.interface.js'; +export * from './manifest-entrypoint.interface.js'; +export * from './manifest-kind.interface.js'; +export * from './utils.js'; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-base.interface.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-base.interface.ts new file mode 100644 index 0000000000..8a89595272 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-base.interface.ts @@ -0,0 +1,29 @@ + +export interface ManifestBase { + /** + * The type of extension such as dashboard etc... + */ + type: string; + + /** + * The alias of the extension, ensure it is unique + */ + alias: string; + + /** + * The kind of the extension, used to group extensions together + * + * @examples ["button"] + */ + kind?: unknown; // I had to add the optional kind property set to undefined. To make the ManifestTypes recognize the Manifest Kind types. Notice that Kinds has to Omit the kind property when extending. + + /** + * The friendly name of the extension + */ + name: string; + + /** + * Extensions such as dashboards are ordered by weight with lower numbers being first in the list + */ + weight?: number; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-bundle.interface.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-bundle.interface.ts new file mode 100644 index 0000000000..25a99091bc --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-bundle.interface.ts @@ -0,0 +1,11 @@ +import type { ManifestPlainJs } from "./base.types.js"; +import type { ManifestBase } from "./manifest-base.interface.js"; + +/** + * This type of extension takes a JS module and registers all exported manifests from the pointed JS file. + */ +export interface ManifestBundle + extends ManifestPlainJs<{ [key: string]: Array }> { + type: 'bundle'; +} + diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-condition.interface.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-condition.interface.ts new file mode 100644 index 0000000000..2faaf18de9 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-condition.interface.ts @@ -0,0 +1,9 @@ +import type { UmbExtensionCondition } from "../condition/index.js"; +import type { ManifestPlainJs } from "./base.types.js"; + +/** + * This type of extension takes a JS module and registers all exported manifests from the pointed JS file. + */ +export interface ManifestCondition extends ManifestPlainJs { + type: 'condition'; +} diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-entrypoint.interface.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-entrypoint.interface.ts new file mode 100644 index 0000000000..76764b321c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-entrypoint.interface.ts @@ -0,0 +1,10 @@ +import type { UmbEntryPointModule } from "../models/index.js"; +import type { ManifestPlainJs } from "./base.types.js"; + +/** + * This type of extension gives full control and will simply load the specified JS file + * You could have custom logic to decide which extensions to load/register by using extensionRegistry + */ +export interface ManifestEntryPoint extends ManifestPlainJs { + type: 'entryPoint'; +} diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-kind.interface.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-kind.interface.ts new file mode 100644 index 0000000000..532e1dea2e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/manifest-kind.interface.ts @@ -0,0 +1,8 @@ + +export interface ManifestKind { + type: 'kind'; + alias: string; + matchType: string; + matchKind: string; + manifest: Partial; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/map.types.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/map.types.ts new file mode 100644 index 0000000000..4c5fbb3b43 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/map.types.ts @@ -0,0 +1,12 @@ +import type { ManifestBase } from "./manifest-base.interface.js"; + +export type ManifestTypeMap = { + [Manifest in ManifestTypes as Manifest['type']]: Manifest; +} & { + [key: string]: ManifestBase; +}; + +export type SpecificManifestTypeOrManifestBase< + ManifestTypes extends ManifestBase, + T extends keyof ManifestTypeMap | string +> = T extends keyof ManifestTypeMap ? ManifestTypeMap[T] : ManifestBase; diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/utils.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/utils.ts new file mode 100644 index 0000000000..64fb696512 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/types/utils.ts @@ -0,0 +1,71 @@ +import type { UmbApi } from "../models/index.js"; + + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type HTMLElementConstructor = new (...args: any[]) => T; + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type ClassConstructor = new (...args: any[]) => T; + + + +// Module Export Types: + +export type ElementLoaderExports< + ElementType extends HTMLElement = HTMLElement +> = ({default: ClassConstructor} | {element: ClassConstructor})// | Omit, 'default'> + +export type ApiLoaderExports< + ApiType extends UmbApi = UmbApi +> = ({default: ClassConstructor} | {api: ClassConstructor})//| Omit, 'default'> + +export type ElementAndJsLoaderExports< + ElementType extends HTMLElement = HTMLElement, + ApiType extends UmbApi = UmbApi +> = ({api: ClassConstructor} | {element: ClassConstructor} | {api: ClassConstructor, element: ClassConstructor})// | Omit, 'api'>, 'default'> + + +// Promise Types: + +export type ElementLoaderPromise< + ElementType extends HTMLElement = HTMLElement +> = (() => Promise>) + +export type ApiLoaderPromise< + ApiType extends UmbApi = UmbApi +> = (() => Promise>) + +export type ElementAndJsLoaderPromise< + ElementType extends HTMLElement = HTMLElement, + ApiType extends UmbApi = UmbApi +> = (() => Promise>) + + +// Property Types: + +export type JsLoaderProperty = ( + string + | + (() => Promise<{default: JsType}>)// | Omit + | + JsType +); +export type ElementLoaderProperty = ( + string + | + ElementLoaderPromise + | + ClassConstructor +); +export type ApiLoaderProperty = ( + string + | + ApiLoaderPromise + | + ClassConstructor +); +export type ElementAndApiLoaderProperty = ( + string + | + ElementAndJsLoaderPromise +); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/manifests.ts index f1f7b08c1c..ff35dfe66d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/debug/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/manifests.ts @@ -5,7 +5,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.ContextDebugger', name: 'Context Debugger Modal', - loader: () => import('./modals/debug/debug-modal.element.js'), + js: () => import('./modals/debug/debug-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-view.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-view.model.ts index eb30c86e59..6e7643e4e9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-view.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-view.model.ts @@ -1,6 +1,7 @@ -import type { ManifestElement, ManifestWithConditions } from '@umbraco-cms/backoffice/extension-api'; +import type { ConditionTypes } from '../conditions/types.js'; +import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; -export interface ManifestCollectionView extends ManifestElement, ManifestWithConditions { +export interface ManifestCollectionView extends ManifestElement, ManifestWithDynamicConditions { type: 'collectionView'; meta: MetaCollectionView; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/localization.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/localization.model.ts index f1ca9eec56..72f218d537 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/localization.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/localization.model.ts @@ -1,7 +1,7 @@ -import type { ManifestWithLoaderIncludingDefaultExport } from '@umbraco-cms/backoffice/extension-api'; +import type { ManifestPlainJs } from '@umbraco-cms/backoffice/extension-api'; import type { UmbLocalizationDictionary } from '@umbraco-cms/backoffice/localization-api'; -export interface ManifestLocalization extends ManifestWithLoaderIncludingDefaultExport { +export interface ManifestLocalization extends ManifestPlainJs { type: 'localization'; meta: MetaLocalization; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace.model.ts index d45272aa5a..83cc8b9ac2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace.model.ts @@ -1,10 +1,11 @@ import type { ManifestElementAndApi, UmbApi } from '@umbraco-cms/backoffice/extension-api'; +// TODO: Missing Extension API Interface: export interface ManifestWorkspace extends ManifestElementAndApi { type: 'workspace'; - meta: MetaEditor; + meta: MetaWorkspace; } -export interface MetaEditor { +export interface MetaWorkspace { entityType: string; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/localization/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/localization/manifests.ts index bbbab0b8fb..1b8eb631d7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/localization/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/localization/manifests.ts @@ -10,7 +10,7 @@ const localizationManifests: Array = [ meta: { culture: 'en-us', }, - loader: () => import('../../../assets/lang/en-us.js'), + js: () => import('../../../assets/lang/en-us.js'), }, { type: 'localization', @@ -20,7 +20,7 @@ const localizationManifests: Array = [ meta: { culture: 'da-dk', }, - loader: () => import('../../../assets/lang/da-dk.js'), + js: () => import('../../../assets/lang/da-dk.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/manifests.ts index 6d7044fd52..033f818926 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/manifests.ts @@ -5,61 +5,61 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.Confirm', name: 'Confirm Modal', - loader: () => import('./confirm/confirm-modal.element.js'), + js: () => import('./confirm/confirm-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.Folder', name: 'Folder Modal', - loader: () => import('./folder/folder-modal.element.js'), + js: () => import('./folder/folder-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.IconPicker', name: 'Icon Picker Modal', - loader: () => import('./icon-picker/icon-picker-modal.element.js'), + js: () => import('./icon-picker/icon-picker-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.LinkPicker', name: 'Link Picker Modal', - loader: () => import('./link-picker/link-picker-modal.element.js'), + js: () => import('./link-picker/link-picker-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.PropertySettings', name: 'Property Settings Modal', - loader: () => import('./property-settings/property-settings-modal.element.js'), + js: () => import('./property-settings/property-settings-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.SectionPicker', name: 'Section Picker Modal', - loader: () => import('./section-picker/section-picker-modal.element.js'), + js: () => import('./section-picker/section-picker-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.Template', name: 'Template Modal', - loader: () => import('./template/template-modal.element.js'), + js: () => import('./template/template-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.CodeEditor', name: 'Code Editor Modal', - loader: () => import('./code-editor/code-editor-modal.element.js'), + js: () => import('./code-editor/code-editor-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.EmbeddedMedia', name: 'Embedded Media Modal', - loader: () => import('./embedded-media/embedded-media-modal.element.js'), + js: () => import('./embedded-media/embedded-media-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.TreePicker', name: 'Tree Picker Modal', - loader: () => import('./tree-picker/tree-picker-modal.element.js'), + js: () => import('./tree-picker/tree-picker-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/manifests.ts index 4286bb2125..1d9096fd90 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/manifests.ts @@ -5,7 +5,7 @@ export const manifests: Array = [ type: 'propertyAction', alias: 'Umb.PropertyAction.Copy', name: 'Copy Property Action', - loader: () => import('./common/copy/property-action-copy.element.js'), + js: () => import('./common/copy/property-action-copy.element.js'), meta: { propertyEditors: ['Umb.PropertyEditorUi.TextBox'], }, @@ -14,7 +14,7 @@ export const manifests: Array = [ type: 'propertyAction', alias: 'Umb.PropertyAction.Clear', name: 'Clear Property Action', - loader: () => import('./common/clear/property-action-clear.element.js'), + js: () => import('./common/clear/property-action-clear.element.js'), meta: { propertyEditors: ['Umb.PropertyEditorUi.TextBox'], }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/manifests.ts index 7da7aba7b7..a637ea4ba1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.BlockGrid.BlockConfiguration', name: 'Block Grid Block Configuration Property Editor UI', - loader: () => import('./property-editor-ui-block-grid-block-configuration.element.js'), + js: () => import('./property-editor-ui-block-grid-block-configuration.element.js'), meta: { label: 'Block Grid Block Configuration', propertyEditorSchemaAlias: 'Umbraco.BlockGrid.BlockConfiguration', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/manifests.ts index 13eb55ca48..67ddcf4f8a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.BlockGrid.GroupConfiguration', name: 'Block Grid Group Configuration Property Editor UI', - loader: () => import('./property-editor-ui-block-grid-group-configuration.element.js'), + js: () => import('./property-editor-ui-block-grid-group-configuration.element.js'), meta: { label: 'Block Grid Group Configuration', propertyEditorSchemaAlias: 'Umbraco.BlockGrid.GroupConfiguration', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/manifests.ts index 23a1bbc221..80dee40314 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.BlockGrid.StylesheetPicker', name: 'Block Grid Stylesheet Picker Property Editor UI', - loader: () => import('./property-editor-ui-block-grid-stylesheet-picker.element.js'), + js: () => import('./property-editor-ui-block-grid-stylesheet-picker.element.js'), meta: { label: 'Block Grid Stylesheet Picker', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/manifests.ts index 08c0dab0e7..10b786c50f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/manifests.ts @@ -7,7 +7,7 @@ const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.BlockGrid', name: 'Block Grid Property Editor UI', - loader: () => import('./property-editor-ui-block-grid.element.js'), + js: () => import('./property-editor-ui-block-grid.element.js'), meta: { label: 'Block Grid', propertyEditorSchemaAlias: 'Umbraco.BlockGrid', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/manifests.ts index 85a68d98d4..0de60e5cc9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.BlockList.BlockConfiguration', name: 'Block List Block Configuration Property Editor UI', - loader: () => import('./property-editor-ui-block-list-block-configuration.element.js'), + js: () => import('./property-editor-ui-block-list-block-configuration.element.js'), meta: { label: 'Block List Block Configuration', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/manifests.ts index fc0f2c0e9d..67c0b50a8e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/manifests.ts @@ -5,7 +5,7 @@ const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.BlockList', name: 'Block List Property Editor UI', - loader: () => import('./property-editor-ui-block-list.element.js'), + js: () => import('./property-editor-ui-block-list.element.js'), meta: { label: 'Block List', propertyEditorSchemaAlias: 'Umbraco.BlockList', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts index 9f8ed56769..1bf1a190e7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CheckboxList', name: 'Checkbox List Property Editor UI', - loader: () => import('./property-editor-ui-checkbox-list.element.js'), + js: () => import('./property-editor-ui-checkbox-list.element.js'), meta: { label: 'Checkbox List', propertyEditorSchemaAlias: 'Umbraco.CheckboxList', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts index 58b180eab1..b7eab89120 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.BulkActionPermissions', name: 'Collection View Bulk Action Permissions Property Editor UI', - loader: () => import('./property-editor-ui-collection-view-bulk-action-permissions.element.js'), + js: () => import('./property-editor-ui-collection-view-bulk-action-permissions.element.js'), meta: { label: 'Collection View Bulk Action Permissions', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts index 4f64a2e993..f620db5289 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.ColumnConfiguration', name: 'Collection View Column Configuration Property Editor UI', - loader: () => import('./property-editor-ui-collection-view-column-configuration.element.js'), + js: () => import('./property-editor-ui-collection-view-column-configuration.element.js'), meta: { label: 'Collection View Column Configuration', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts index ff82f4f963..e7b676efaf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.LayoutConfiguration', name: 'Collection View Column Configuration Property Editor UI', - loader: () => import('./property-editor-ui-collection-view-layout-configuration.element.js'), + js: () => import('./property-editor-ui-collection-view-layout-configuration.element.js'), meta: { label: 'Collection View Layout Configuration', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts index ca7e12e238..5e2e4a331f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.OrderBy', name: 'Collection View Column Configuration Property Editor UI', - loader: () => import('./property-editor-ui-collection-view-order-by.element.js'), + js: () => import('./property-editor-ui-collection-view-order-by.element.js'), meta: { label: 'Collection View Order By', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts index 4f9ec72e14..ee2acaff38 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts @@ -8,7 +8,7 @@ const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView', name: 'Collection View Property Editor UI', - loader: () => import('./property-editor-ui-collection-view.element.js'), + js: () => import('./property-editor-ui-collection-view.element.js'), meta: { label: 'Collection View', propertyEditorSchemaAlias: 'Umbraco.ListView', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/manifests.ts index f057cf0261..7b2fff99ba 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.ColorPicker', name: 'Color Picker Property Editor UI', - loader: () => import('./property-editor-ui-color-picker.element.js'), + js: () => import('./property-editor-ui-color-picker.element.js'), meta: { label: 'Color Picker', propertyEditorSchemaAlias: 'Umbraco.ColorPicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/manifests.ts index 9facbbc6ba..1794af37be 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.DatePicker', name: 'Date Picker Property Editor UI', - loader: () => import('./property-editor-ui-date-picker.element.js'), + js: () => import('./property-editor-ui-date-picker.element.js'), meta: { label: 'Date Picker', propertyEditorSchemaAlias: 'Umbraco.DateTime', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts index 17fa07930a..912512ed48 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Dropdown', name: 'Dropdown Property Editor UI', - loader: () => import('./property-editor-ui-dropdown.element.js'), + js: () => import('./property-editor-ui-dropdown.element.js'), meta: { label: 'Dropdown', propertyEditorSchemaAlias: 'Umbraco.Dropdown', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/manifests.ts index d6e0676f30..0dd8bfbc18 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.EyeDropper', name: 'Eye Dropper Color Picker Property Editor UI', - loader: () => import('./property-editor-ui-eye-dropper.element.js'), + js: () => import('./property-editor-ui-eye-dropper.element.js'), meta: { label: 'Eye Dropper Color Picker', icon: 'icon-colorpicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/manifests.ts index 31590a83cc..7c97194a4c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.IconPicker', name: 'Icon Picker Property Editor UI', - loader: () => import('./property-editor-ui-icon-picker.element.js'), + js: () => import('./property-editor-ui-icon-picker.element.js'), meta: { label: 'Icon Picker', propertyEditorSchemaAlias: 'Umbraco.IconPicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/manifests.ts index fd615a5f62..0a3eb6db6f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-cropper/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.ImageCropper', name: 'Image Cropper Property Editor UI', - loader: () => import('./property-editor-ui-image-cropper.element.js'), + js: () => import('./property-editor-ui-image-cropper.element.js'), meta: { label: 'Image Cropper', icon: 'icon-colorpicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/manifests.ts index e54c89a0f8..691e2da56f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/image-crops-configuration/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.ImageCropsConfiguration', name: 'Image Crops Configuration Property Editor UI', - loader: () => import('./property-editor-ui-image-crops-configuration.element.js'), + js: () => import('./property-editor-ui-image-crops-configuration.element.js'), meta: { label: 'Image Crops Configuration', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/manifests.ts index 89eb715670..438b91fe4f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Label', name: 'Label Property Editor UI', - loader: () => import('./property-editor-ui-label.element.js'), + js: () => import('./property-editor-ui-label.element.js'), meta: { label: 'Label', icon: 'icon-readonly', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts index 23c901afe7..d24e002b7e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts @@ -69,7 +69,7 @@ export const manifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Number', name: 'Number Property Editor UI', - loader: () => import('./number/property-editor-ui-number.element.js'), + js: () => import('./number/property-editor-ui-number.element.js'), meta: { label: 'Number', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/manifests.ts index 39edd94f12..ba1a71a494 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.MarkdownEditor', name: 'Markdown Editor Property Editor UI', - loader: () => import('./property-editor-ui-markdown-editor.element.js'), + js: () => import('./property-editor-ui-markdown-editor.element.js'), meta: { label: 'Markdown Editor', propertyEditorSchemaAlias: 'Umbraco.MarkdownEditor', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/manifests.ts index 716e7f1c47..43f21ff442 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/media-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.MediaPicker', name: 'Markdown Editor Property Editor UI', - loader: () => import('./property-editor-ui-media-picker.element.js'), + js: () => import('./property-editor-ui-media-picker.element.js'), meta: { label: 'Media Picker', propertyEditorSchemaAlias: 'Umbraco.MediaPicker3', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/manifests.ts index 0788efba6b..d2ffb94f7c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.MemberGroupPicker', name: 'Member Group Picker Property Editor UI', - loader: () => import('./property-editor-ui-member-group-picker.element.js'), + js: () => import('./property-editor-ui-member-group-picker.element.js'), meta: { label: 'Member Group Picker', propertyEditorSchemaAlias: 'Umbraco.MemberGroupPicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/manifests.ts index 079e333aff..875ecd4bc3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.MemberPicker', name: 'Member Picker Property Editor UI', - loader: () => import('./property-editor-ui-member-picker.element.js'), + js: () => import('./property-editor-ui-member-picker.element.js'), meta: { label: 'Member Picker', propertyEditorSchemaAlias: 'Umbraco.MemberPicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/manifests.ts index 246b61451d..98c0e38aa2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.MultiUrlPicker', name: 'Multi URL Picker Property Editor UI', - loader: () => import('./property-editor-ui-multi-url-picker.element.js'), + js: () => import('./property-editor-ui-multi-url-picker.element.js'), meta: { label: 'Multi URL Picker', propertyEditorSchemaAlias: 'Umbraco.MultiUrlPicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/manifests.ts index 96285b9b16..acc4f72fe6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.MultipleTextString', name: 'Multiple Text String Property Editor UI', - loader: () => import('./property-editor-ui-multiple-text-string.element.js'), + js: () => import('./property-editor-ui-multiple-text-string.element.js'), meta: { label: 'Multiple Text String', propertyEditorSchemaAlias: 'Umbraco.MultipleTextString', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/manifests.ts index d8a7741082..c09a91473b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.NumberRange', name: 'Number Range Property Editor UI', - loader: () => import('./property-editor-ui-number-range.element.js'), + js: () => import('./property-editor-ui-number-range.element.js'), meta: { label: 'Number Range', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/manifests.ts index f1ea28e1d6..91e182c646 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/manifests.ts @@ -12,7 +12,7 @@ export const manifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Integer', name: 'Integer Property Editor UI', - loader: () => import('./property-editor-ui-number.element.js'), + js: () => import('./property-editor-ui-number.element.js'), meta: { label: 'Integer', propertyEditorSchemaAlias: 'Umbraco.Integer', @@ -33,7 +33,7 @@ export const manifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Decimal', name: 'Decimal Property Editor UI', - loader: () => import('./property-editor-ui-number.element.js'), + js: () => import('./property-editor-ui-number.element.js'), meta: { label: 'Decimal', propertyEditorSchemaAlias: 'Umbraco.Decimal', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/manifests.ts index 73a017f20c..e127106166 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.OrderDirection', name: 'Order Direction Property Editor UI', - loader: () => import('./property-editor-ui-order-direction.element.js'), + js: () => import('./property-editor-ui-order-direction.element.js'), meta: { label: 'Order Direction', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/manifests.ts index b238cd9645..4dfdfcfd0f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.OverlaySize', name: 'Overlay Size Property Editor UI', - loader: () => import('./property-editor-ui-overlay-size.element.js'), + js: () => import('./property-editor-ui-overlay-size.element.js'), meta: { label: 'Overlay Size', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/manifests.ts index 353e21d338..b542fbebb4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.RadioButtonList', name: 'Radio Button List Property Editor UI', - loader: () => import('./property-editor-ui-radio-button-list.element.js'), + js: () => import('./property-editor-ui-radio-button-list.element.js'), meta: { label: 'Radio Button List', propertyEditorSchemaAlias: 'Umbraco.RadioButtonList', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/manifests.ts index 0f67cba70d..24a6fe0a7f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Slider', name: 'Slider Property Editor UI', - loader: () => import('./property-editor-ui-slider.element.js'), + js: () => import('./property-editor-ui-slider.element.js'), meta: { label: 'Slider', propertyEditorSchemaAlias: 'Umbraco.Slider', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/manifests.ts index 1a70870708..f67a4fa08e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/manifests.ts @@ -13,7 +13,7 @@ export const manifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.TextBox', name: 'Text Box Property Editor UI', - loader: () => import('./property-editor-ui-text-box.element.js'), + js: () => import('./property-editor-ui-text-box.element.js'), meta: { label: 'Text Box', propertyEditorSchemaAlias: 'Umbraco.TextBox', @@ -34,7 +34,7 @@ export const manifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Email', name: 'Email Property Editor UI', - loader: () => import('./property-editor-ui-text-box.element.js'), + js: () => import('./property-editor-ui-text-box.element.js'), meta: { label: 'Email', propertyEditorSchemaAlias: 'Umbraco.EmailAddress', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/manifests.ts index eac2bf8605..a660eb9f9f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.TextArea', name: 'Text Area Property Editor UI', - loader: () => import('./property-editor-ui-textarea.element.js'), + js: () => import('./property-editor-ui-textarea.element.js'), meta: { label: 'Text Area', propertyEditorSchemaAlias: 'Umbraco.TextArea', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/manifests.ts index 987898d117..6d473ac5ef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/manifests.ts @@ -5,7 +5,7 @@ const configurationManifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUI.TinyMCE.ToolbarConfiguration', name: 'TinyMCE Toolbar Property Editor UI', - loader: () => import('./toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.js'), + js: () => import('./toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.js'), meta: { label: 'TinyMCE Toolbar Configuration', propertyEditorSchemaAlias: 'Umbraco.RichText.Configuration', @@ -17,7 +17,7 @@ const configurationManifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUI.TinyMCE.StylesheetsConfiguration', name: 'TinyMCE Stylesheets Property Editor UI', - loader: () => import('./stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.element.js'), + js: () => import('./stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.element.js'), meta: { label: 'TinyMCE Stylesheets Configuration', propertyEditorSchemaAlias: 'Umbraco.RichText.Configuration', @@ -29,7 +29,7 @@ const configurationManifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUI.TinyMCE.DimensionsConfiguration', name: 'TinyMCE Dimensions Property Editor UI', - loader: () => import('./dimensions/property-editor-ui-tiny-mce-dimensions-configuration.element.js'), + js: () => import('./dimensions/property-editor-ui-tiny-mce-dimensions-configuration.element.js'), meta: { label: 'TinyMCE Dimensions Configuration', propertyEditorSchemaAlias: 'Umbraco.RichText.Configuration', @@ -41,7 +41,7 @@ const configurationManifests: Array = [ type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUI.TinyMCE.MaxImageSizeConfiguration', name: 'TinyMCE Max Image Size Property Editor UI', - loader: () => import('./max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.element.js'), + js: () => import('./max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.element.js'), meta: { label: 'TinyMCE Max Image Size Configuration', propertyEditorSchemaAlias: 'Umbraco.RichText.Configuration', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/manifests.ts index 78a2d8aa38..f9db7b02f7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/manifests.ts @@ -5,7 +5,7 @@ const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.TinyMCE', name: 'Rich Text Editor Property Editor UI', - loader: () => import('./property-editor-ui-tiny-mce.element.js'), + js: () => import('./property-editor-ui-tiny-mce.element.js'), meta: { label: 'Rich Text Editor', propertyEditorSchemaAlias: 'Umbraco.RichText', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/manifests.ts index be1274b4bf..f4d4718e08 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/manifests.ts @@ -5,7 +5,7 @@ const pluginManifests: Array = [ type: 'tinyMcePlugin', alias: 'Umb.TinyMcePlugin.CodeEditor', name: 'Code Editor TinyMCE Plugin', - loader: () => import('./tiny-mce-code-editor.plugin.js'), + js: () => import('./tiny-mce-code-editor.plugin.js'), meta: { toolbar: [ { @@ -20,7 +20,7 @@ const pluginManifests: Array = [ type: 'tinyMcePlugin', alias: 'Umb.TinyMcePlugin.LinkPicker', name: 'Link Picker TinyMCE Plugin', - loader: () => import('./tiny-mce-linkpicker.plugin.js'), + js: () => import('./tiny-mce-linkpicker.plugin.js'), meta: { toolbar: [ { @@ -40,7 +40,7 @@ const pluginManifests: Array = [ type: 'tinyMcePlugin', alias: 'Umb.TinyMcePlugin.MediaPicker', name: 'Media Picker TinyMCE Plugin', - loader: () => import('./tiny-mce-mediapicker.plugin.js'), + js: () => import('./tiny-mce-mediapicker.plugin.js'), meta: { toolbar: [ { @@ -55,7 +55,7 @@ const pluginManifests: Array = [ type: 'tinyMcePlugin', alias: 'Umb.TinyMcePlugin.EmbeddedMedia', name: 'Embedded Media TinyMCE Plugin', - loader: () => import('./tiny-mce-embeddedmedia.plugin.js'), + js: () => import('./tiny-mce-embeddedmedia.plugin.js'), meta: { toolbar: [ { @@ -70,7 +70,7 @@ const pluginManifests: Array = [ type: 'tinyMcePlugin', alias: 'Umb.TinyMcePlugin.MacroPicker', name: 'Macro Picker TinyMCE Plugin', - loader: () => import('./tiny-mce-macropicker.plugin.js'), + js: () => import('./tiny-mce-macropicker.plugin.js'), meta: { toolbar: [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/manifests.ts index 2f440b2102..f357dc2079 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Toggle', name: 'Toggle Property Editor UI', - loader: () => import('./property-editor-ui-toggle.element.js'), + js: () => import('./property-editor-ui-toggle.element.js'), meta: { label: 'Toggle', propertyEditorSchemaAlias: 'Umbraco.TrueFalse', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/start-node/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/start-node/manifests.ts index 910db83801..6f2287e7ab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/start-node/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/start-node/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.TreePicker.StartNode', name: 'Tree Picker Start Node Property Editor UI', - loader: () => import('./property-editor-ui-tree-picker-start-node.element.js'), + js: () => import('./property-editor-ui-tree-picker-start-node.element.js'), meta: { label: 'Tree Picker Start Node', icon: 'icon-page-add', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/manifests.ts index 5bc4c2e589..96cd59d02c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/manifests.ts @@ -5,7 +5,7 @@ const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.TreePicker', name: 'Tree Picker Property Editor UI', - loader: () => import('./property-editor-ui-tree-picker.element.js'), + js: () => import('./property-editor-ui-tree-picker.element.js'), meta: { label: 'Tree Picker', icon: 'icon-page-add', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/manifests.ts index ee3504e95a..8c7c9cf522 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.UploadField', name: 'Upload Field Property Editor UI', - loader: () => import('./property-editor-ui-upload-field.element.js'), + js: () => import('./property-editor-ui-upload-field.element.js'), meta: { label: 'Upload Field', propertyEditorSchemaAlias: 'Umbraco.UploadField', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/manifests.ts index f80baede7f..bb0ab0f765 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.UserPicker', name: 'User Picker Property Editor UI', - loader: () => import('./property-editor-ui-user-picker.element.js'), + js: () => import('./property-editor-ui-user-picker.element.js'), meta: { label: 'User Picker', propertyEditorSchemaAlias: 'Umbraco.UserPicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/manifests.ts index d6c8ec6ea9..34b1e679ab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.ValueType', name: 'Value Type Property Editor UI', - loader: () => import('./property-editor-ui-value-type.element.js'), + js: () => import('./property-editor-ui-value-type.element.js'), meta: { label: 'Value Type', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/themes/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/themes/manifests.ts index ca2c0d1285..8754ac2767 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/themes/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/themes/manifests.ts @@ -5,7 +5,7 @@ export const themes: Array = [ type: 'globalContext', alias: 'Umb.GlobalContext.Theme', name: 'Theme Context', - loader: () => import('./theme.context.js'), + js: () => import('./theme.context.js'), }, { type: 'theme', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/core/umbraco-package.ts index 5a4b160bb8..7029aa3be3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/umbraco-package.ts @@ -7,6 +7,6 @@ export const extensions: Array = [ name: 'Core Entry Point', alias: 'Umb.EntryPoint.Core', type: 'entryPoint', - loader: () => import('./index.js'), + js: () => import('./index.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/manifests.ts index 4d7e841c95..f0f2d124b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/manifests.ts @@ -4,7 +4,7 @@ const workspaceModal: ManifestModal = { type: 'modal', alias: 'Umb.Modal.Workspace', name: 'Workspace Modal', - loader: () => import('./workspace-modal.element.js'), + js: () => import('./workspace-modal.element.js'), }; export const manifests = [workspaceModal]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/manifests.ts index 8cb6b7a040..312daf6371 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/entity-actions/manifests.ts @@ -95,19 +95,19 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.CreateDictionary', name: 'Create Dictionary Modal', - loader: () => import('./create/create-dictionary-modal.element.js'), + js: () => import('./create/create-dictionary-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.ExportDictionary', name: 'Export Dictionary Modal', - loader: () => import('./export/export-dictionary-modal.element.js'), + js: () => import('./export/export-dictionary-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.ImportDictionary', name: 'Import Dictionary Modal', - loader: () => import('./import/import-dictionary-modal.element.js'), + js: () => import('./import/import-dictionary-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/menu-item/manifests.ts index 6d15c07043..c233113fef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/menu-item/manifests.ts @@ -5,7 +5,7 @@ const menuItem: ManifestMenuItem = { alias: 'Umb.MenuItem.Dictionary', name: 'Dictionary Menu Item', weight: 400, - loader: () => import('./dictionary-menu-item.element.js'), + js: () => import('./dictionary-menu-item.element.js'), meta: { label: 'Dictionary', icon: 'icon-book-alt', diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/manifests.ts index fe24ca792a..76ff32fd89 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.Dictionary', name: 'Dictionary Workspace', - loader: () => import('./dictionary-workspace.element.js'), + js: () => import('./dictionary-workspace.element.js'), meta: { entityType: 'dictionary-item', }, @@ -20,7 +20,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Dictionary.Edit', name: 'Dictionary Workspace Edit View', - loader: () => import('./views/editor/workspace-view-dictionary-editor.element.js'), + js: () => import('./views/editor/workspace-view-dictionary-editor.element.js'), weight: 100, meta: { label: 'Edit', diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/section.manifest.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/section.manifest.ts index 53f963ca62..eefc5e1c62 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/section.manifest.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/section.manifest.ts @@ -37,7 +37,7 @@ const dashboards: Array = [ alias: 'Umb.Dashboard.LocalizationDictionary', name: 'Dictionary localization Dashboard', elementName: 'umb-dashboard-translation-dictionary', - loader: () => import('./dashboards/dictionary/dashboard-localization-dictionary.element.js'), + js: () => import('./dashboards/dictionary/dashboard-localization-dictionary.element.js'), meta: { label: 'Dictionary overview', pathname: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/umbraco-package.ts index 270c7257e8..decfec4787 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Dictionary Management Bundle', alias: 'Umb.Dictionary.TranslationManagement', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/manifests.ts index 1a4b46c347..4d156accdd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/manifests.ts @@ -5,7 +5,7 @@ const dashboards: Array = [ type: 'dashboard', alias: 'Umb.Dashboard.RedirectManagement', name: 'Redirect Management Dashboard', - loader: () => import('./redirect-management/dashboard-redirect-management.element.js'), + js: () => import('./redirect-management/dashboard-redirect-management.element.js'), weight: 10, meta: { label: 'Redirect Management', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/manifests.ts index 944e219ec5..895fa704a4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/manifests.ts @@ -8,7 +8,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.DocumentBlueprint.Root', name: 'Document Blueprint Root Workspace', - loader: () => import('./document-blueprint-root-workspace.element.js'), + js: () => import('./document-blueprint-root-workspace.element.js'), meta: { entityType: 'document-blueprint-root', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts index d469db62a9..8bd1bc0b02 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts @@ -25,7 +25,7 @@ const entityActions: Array = [ type: 'modal', alias: 'Umb.Modal.DocumentTypeCreateOptions', name: 'Document Type Create Options Modal', - loader: () => import('./modal/document-type-create-options-modal.element.js'), + js: () => import('./modal/document-type-create-options-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/manifests.ts index 7d6841ff51..1ee9fee6f6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.DocumentType', name: 'Document Type Workspace', - loader: () => import('./document-type-workspace.element.js'), + js: () => import('./document-type-workspace.element.js'), meta: { entityType: 'document-type', }, @@ -20,7 +20,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.DocumentType.Design', name: 'Document Type Workspace Design View', - loader: () => import('./views/design/document-type-workspace-view-edit.element.js'), + js: () => import('./views/design/document-type-workspace-view-edit.element.js'), weight: 1000, meta: { label: 'Design', @@ -38,7 +38,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.DocumentType.Structure', name: 'Document Type Workspace Structure View', - loader: () => import('./views/structure/document-type-workspace-view-structure.element.js'), + js: () => import('./views/structure/document-type-workspace-view-structure.element.js'), weight: 800, meta: { label: 'Structure', @@ -56,7 +56,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.DocumentType.Settings', name: 'Document Type Workspace Settings View', - loader: () => import('./views/settings/document-type-workspace-view-settings.element.js'), + js: () => import('./views/settings/document-type-workspace-view-settings.element.js'), weight: 600, meta: { label: 'Settings', @@ -74,7 +74,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.DocumentType.Templates', name: 'Document Type Workspace Templates View', - loader: () => import('./views/templates/document-type-workspace-view-templates.element.js'), + js: () => import('./views/templates/document-type-workspace-view-templates.element.js'), weight: 400, meta: { label: 'Templates', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/manifests.ts index 944c3e369c..14a2951b5e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/manifests.ts @@ -5,11 +5,12 @@ export const manifests: Array = [ type: 'collectionView', alias: 'Umb.CollectionView.Document.Table', name: 'Document Table Collection View', - loader: () => import('./views/table/document-table-collection-view.element.js'), + js: () => import('./views/table/document-table-collection-view.element.js'), weight: 200, - conditions: { - entityType: 'document', - }, + conditions: [{ + alias: 'Umb.Condition.WorkspaceEntityType', + match: 'document', + }], meta: { label: 'Table', icon: 'icon-box', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts index 360ec037ac..d66af69e0a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts @@ -35,7 +35,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.CreateDocument', name: 'Create Document Modal', - loader: () => import('./create-document-modal.element.js'), + js: () => import('./create-document-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/manifests.ts index b68a9ac96d..0e5ea7d6c4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/manifests.ts @@ -23,7 +23,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.Permissions', name: 'Permissions Modal', - loader: () => import('./permissions-modal.element.js'), + js: () => import('./permissions-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/menu-item/manifests.ts index 296de6cb49..a691a7eb02 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/menu-item/manifests.ts @@ -5,7 +5,7 @@ const menuItem: ManifestMenuItem = { alias: 'Umb.MenuItem.Documents', name: 'Documents Menu Item', weight: 200, - loader: () => import('./document-menu-item.element.js'), + js: () => import('./document-menu-item.element.js'), meta: { label: 'Documents', icon: 'icon-folder', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts index a7016dff88..fc2041a32b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.DocumentPicker', name: 'Document Picker Property Editor UI', - loader: () => import('./property-editor-ui-document-picker.element.js'), + js: () => import('./property-editor-ui-document-picker.element.js'), meta: { label: 'Document Picker', propertyEditorSchemaAlias: 'Umbraco.ContentPicker', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts index 64d79b138c..1887ee00ae 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts @@ -16,7 +16,7 @@ const treeItem: ManifestTreeItem = { type: 'treeItem', alias: 'Umb.TreeItem.Document', name: 'Document Tree Item', - loader: () => import('./tree-item/document-tree-item.element.js'), + js: () => import('./tree-item/document-tree-item.element.js'), meta: { entityTypes: ['document-root', 'document'], }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.element.ts index 7118bbcf81..c1d3c4e6e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.element.ts @@ -21,9 +21,10 @@ export class UmbDocumentWorkspaceElement extends UmbLitElement { public set manifest(manifest: ManifestWorkspace) { - console.log("got manifest", manifest) + console.log("got manifest", manifest.alias) + // TODO: Make context declaration. - createExtensionApi(this.manifest, [this]).then( (context) => { + createExtensionApi(manifest, [this]).then( (context) => { if(context) { this.#gotWorkspaceContext(context); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts index 8c25540734..439a831b93 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts @@ -1,10 +1,12 @@ import { UmbDocumentSaveAndPublishWorkspaceAction } from './actions/save-and-publish.action.js'; import { UmbDocumentSaveAndPreviewWorkspaceAction } from './actions/save-and-preview.action.js'; import { UmbSaveAndScheduleDocumentWorkspaceAction } from './actions/save-and-schedule.action.js'; +import { UmbDocumentWorkspaceContext } from './document-workspace.context.js'; // JUST FOR TEST import { UmbSaveWorkspaceAction } from '@umbraco-cms/backoffice/workspace'; import type { ManifestWorkspace, ManifestWorkspaceAction, + ManifestWorkspaceContext, ManifestWorkspaceEditorView, ManifestWorkspaceViewCollection, } from '@umbraco-cms/backoffice/extension-registry'; @@ -13,18 +15,32 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.Document', name: 'Document Workspace', - loader: () => import('./document-workspace.element.js'), + js: () => import('./document-workspace.element.js'), + api: UmbDocumentWorkspaceContext, meta: { entityType: 'document', }, }; +const workspaceContext: ManifestWorkspaceContext = { + type: 'workspaceContext', + alias: 'Umb.WorkspaceContext.Document', + name: 'Document Workspace Context', + js: './bla-test.js', + conditions: [ + { + alias: 'Umb.Condition.WorkspaceAlias', + match: workspace.alias, + }, + ], +}; + const workspaceEditorViews: Array = [ { type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Document.Edit', name: 'Document Workspace Edit View', - loader: () => import('./views/edit/document-workspace-view-edit.element.js'), + js: () => import('./views/edit/document-workspace-view-edit.element.js'), weight: 200, meta: { label: 'Content', @@ -42,7 +58,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Document.Info', name: 'Document Workspace Info View', - loader: () => import('./views/info/document-info-workspace-view.element.js'), + js: () => import('./views/info/document-info-workspace-view.element.js'), weight: 100, meta: { label: 'Info', @@ -152,4 +168,4 @@ const workspaceActions: Array = [ */ ]; -export const manifests = [workspace, ...workspaceEditorViews, ...workspaceViewCollections, ...workspaceActions]; +export const manifests = [workspace, workspaceContext, ...workspaceEditorViews, ...workspaceViewCollections, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/umbraco-package.ts index 260460b442..aa0f708133 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Document Management Bundle', alias: 'Umb.Bundle.DocumentManagement', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/manifests.ts index b4ecc50de9..f40347abb5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/manifests.ts @@ -4,7 +4,7 @@ export const manifests = [ alias: 'Umb.Dashboard.HealthCheck', name: 'Health Check', elementName: 'umb-dashboard-health-check', - loader: () => import('./dashboard-health-check.element.js'), + js: () => import('./dashboard-health-check.element.js'), weight: 102, meta: { label: 'Health Check', diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/umbraco-package.ts index 3d26664c83..e5010de863 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Health Check Bundle', alias: 'Umb.Bundle.HealthCheck', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/umbraco-package.ts index 88065840c9..e6bf88561d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Log Viewer Bundle', alias: 'Umb.Bundle.LogViewer', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer/manifests.ts index 1f18fed08a..fca448fb96 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer/manifests.ts @@ -11,7 +11,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: workspaceAlias, name: 'LogViewer Root Workspace', - loader: () => import('./logviewer-workspace.element.js'), + js: () => import('./logviewer-workspace.element.js'), meta: { entityType: 'logviewer', }, @@ -22,7 +22,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.LogViewer.Overview', name: 'LogViewer Root Workspace Overview View', - loader: () => import('../views/overview/index.js'), + js: () => import('../views/overview/index.js'), weight: 300, meta: { label: 'Overview', @@ -40,7 +40,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.LogViewer.Search', name: 'LogViewer Root Workspace Search View', - loader: () => import('../views/search/index.js'), + js: () => import('../views/search/index.js'), weight: 200, meta: { label: 'Search', @@ -63,7 +63,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.LogViewer.SaveSearch', name: 'Saved Searches Modal', - loader: () => import('../views/search/components/log-viewer-search-input-modal.element.js'), + js: () => import('../views/search/components/log-viewer-search-input-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/manifests.ts index 99b6c879ff..1b23b3567c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/manifests.ts @@ -11,7 +11,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.MediaType', name: 'Media Type Workspace', - loader: () => import('./media-type-workspace.element.js'), + js: () => import('./media-type-workspace.element.js'), meta: { entityType: 'media-type', }, @@ -22,7 +22,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.MediaType.Design', name: 'Media Type Workspace Design View', - loader: () => import('./views/details/media-type-design-workspace-view.element.js'), + js: () => import('./views/details/media-type-design-workspace-view.element.js'), weight: 90, meta: { label: 'Details', @@ -40,7 +40,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.MediaType.ListView', name: 'Media Type Workspace ListView View', - loader: () => import('./views/details/media-type-list-view-workspace-view.element.js'), + js: () => import('./views/details/media-type-list-view-workspace-view.element.js'), weight: 90, meta: { label: 'List View', @@ -58,7 +58,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.MediaType.Permissions', name: 'Media Type Workspace Permissions View', - loader: () => import('./views/details/media-type-permissions-workspace-view.element.js'), + js: () => import('./views/details/media-type-permissions-workspace-view.element.js'), weight: 90, meta: { label: 'Permissions', diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/manifests.ts index 25fbc5a8c3..875a88e8e4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/manifests.ts @@ -5,46 +5,49 @@ export const manifests: Array = [ type: 'collectionView', alias: 'Umb.CollectionView.MediaGrid', name: 'Media Grid Collection View', - loader: () => import('./media-grid-collection-view.element.js'), + js: () => import('./media-grid-collection-view.element.js'), weight: 300, meta: { label: 'Grid', icon: 'icon-grid', pathName: 'grid', }, - conditions: { - entityType: 'media', - }, + conditions: [{ + alias: 'Umb.Condition.WorkspaceEntityType', + match: 'media', + }], }, { type: 'collectionView', alias: 'Umb.CollectionView.MediaTable', name: 'Media Table Collection View', - loader: () => import('./media-table-collection-view.element.js'), + js: () => import('./media-table-collection-view.element.js'), weight: 200, meta: { label: 'Table', icon: 'icon-box', pathName: 'table', }, - conditions: { - entityType: 'media', - }, + conditions: [{ + alias: 'Umb.Condition.WorkspaceEntityType', + match: 'media', + }], }, { type: 'collectionView', alias: 'Umb.CollectionView.Test', name: 'Test', elementName: 'umb-collection-view-media-test', - loader: () => import('./collection-view-media-test.element.js'), + js: () => import('./collection-view-media-test.element.js'), weight: 100, meta: { label: 'Test', icon: 'icon-newspaper', pathName: 'test', }, - conditions: { - entityType: 'media', - }, + conditions: [{ + alias: 'Umb.Condition.WorkspaceEntityType', + match: 'media', + }], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/menu-item/manifests.ts index b369a0c8e8..958e815144 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/menu-item/manifests.ts @@ -5,7 +5,7 @@ const menuItem: ManifestMenuItem = { alias: 'Umb.MenuItem.Media', name: 'Media Menu Item', weight: 100, - loader: () => import('./media-menu-item.element.js'), + js: () => import('./media-menu-item.element.js'), meta: { label: 'Media', icon: 'icon-folder', diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts index 36d31ed716..1501b0f3cb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts @@ -11,7 +11,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.Media', name: 'Media Workspace', - loader: () => import('./media-workspace.element.js'), + js: () => import('./media-workspace.element.js'), meta: { entityType: 'media', }, @@ -22,7 +22,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Media.Edit', name: 'Media Workspace Edit View', - loader: () => import('./views/edit/media-edit-workspace-view.element.js'), + js: () => import('./views/edit/media-edit-workspace-view.element.js'), weight: 200, meta: { label: 'Media', @@ -40,7 +40,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Media.Info', name: 'Media Workspace Info View', - loader: () => import('./views/info/media-info-workspace-view.element.js'), + js: () => import('./views/info/media-info-workspace-view.element.js'), weight: 100, meta: { label: 'Info', diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/media/umbraco-package.ts index 33cc7c2bc3..5e9568b348 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Media Management Bundle', alias: 'Umb.Bundle.MediaManagement', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/manifests.ts index afee21b7f3..5a1f0a6f09 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.MemberGroup', name: 'Member Group Workspace', - loader: () => import('./member-group-workspace.element.js'), + js: () => import('./member-group-workspace.element.js'), meta: { entityType: 'member-group', }, @@ -20,7 +20,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.MemberGroup.Info', name: 'Member Group Workspace Info View', - loader: () => import('./views/info/workspace-view-member-group-info.element.js'), + js: () => import('./views/info/workspace-view-member-group-info.element.js'), weight: 90, meta: { label: 'Info', diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/manifests.ts index b10ff49eea..b2b3d120e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/manifests.ts @@ -8,7 +8,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.MemberType', name: 'Member Type Workspace', - loader: () => import('./member-type-workspace.element.js'), + js: () => import('./member-type-workspace.element.js'), meta: { entityType: 'member-type', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/manifests.ts index b547fe9a67..f31d8fea93 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/manifests.ts @@ -8,7 +8,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.Member', name: 'Member Workspace', - loader: () => import('./member-workspace.element.js'), + js: () => import('./member-workspace.element.js'), meta: { entityType: 'member', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/section.manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/section.manifests.ts index 1ad8476658..622d1c8cff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/section.manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/section.manifests.ts @@ -19,7 +19,7 @@ const dashboards: Array = [ alias: 'Umb.Dashboard.Members', name: 'Members Dashboard', weight: 10, - loader: () => import('./dashboards/welcome/dashboard-members-welcome.element.js'), + js: () => import('./dashboards/welcome/dashboard-members-welcome.element.js'), meta: { label: 'Members', pathname: 'members', diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/members/umbraco-package.ts index d9f3f5ca2d..00cf4a8912 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Member Management Bundle', alias: 'Umb.Bundle.MemberManagement', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/manifests.ts index 960013f966..6596b52a70 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.PackageBuilder', name: 'Package Builder Workspace', - loader: () => import('./workspace/workspace-package-builder.element.js'), + js: () => import('./workspace/workspace-package-builder.element.js'), meta: { entityType: 'package-builder', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/manifests.ts index 7ceb2f10d3..e29749ec86 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.Package', name: 'Package Workspace', - loader: () => import('./workspace/workspace-package.element.js'), + js: () => import('./workspace/workspace-package.element.js'), meta: { entityType: 'package', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/manifests.ts index 1f9449f458..24a35bcf07 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/manifests.ts @@ -18,7 +18,7 @@ const sectionsViews: Array = [ type: 'sectionView', alias: 'Umb.SectionView.Packages.Repo', name: 'Packages Repo Section View', - loader: () => import('./views/market-place/packages-market-place-section-view.element.js'), + js: () => import('./views/market-place/packages-market-place-section-view.element.js'), weight: 300, meta: { label: 'Packages', @@ -36,7 +36,7 @@ const sectionsViews: Array = [ type: 'sectionView', alias: 'Umb.SectionView.Packages.Installed', name: 'Installed Packages Section View', - loader: () => import('./views/installed/installed-packages-section-view.element.js'), + js: () => import('./views/installed/installed-packages-section-view.element.js'), weight: 200, meta: { label: 'Installed', @@ -54,7 +54,7 @@ const sectionsViews: Array = [ type: 'sectionView', alias: 'Umb.SectionView.Packages.Builder', name: 'Packages Builder Section View', - loader: () => import('./views/created/created-packages-section-view.element.js'), + js: () => import('./views/created/created-packages-section-view.element.js'), weight: 100, meta: { label: 'Created', diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/umbraco-package.ts index 860930db14..0fea44fd6b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Package Management Bundle', alias: 'Umb.Bundle.PackageManagement', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/search/manifests.ts index f75e4cf10a..a1bc0bfa11 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/manifests.ts @@ -5,7 +5,7 @@ export const manifests: Array = [ type: 'headerApp', alias: 'Umb.HeaderApp.Search', name: 'Header App Search', - loader: () => import('./umb-search-header-app.element.js'), + js: () => import('./umb-search-header-app.element.js'), weight: 900, meta: { label: 'Search', @@ -17,14 +17,14 @@ export const manifests: Array = [ type: 'modal', alias: 'Umb.Modal.Search', name: 'Search Modal', - loader: () => import('./search-modal/search-modal.element.js'), + js: () => import('./search-modal/search-modal.element.js'), }, { type: 'dashboard', alias: 'Umb.Dashboard.ExamineManagement', name: 'Examine Management Dashboard', elementName: 'umb-dashboard-examine-management', - loader: () => import('./examine-management-dashboard/dashboard-examine-management.element.js'), + js: () => import('./examine-management-dashboard/dashboard-examine-management.element.js'), weight: 400, meta: { label: 'Examine Management', @@ -41,6 +41,6 @@ export const manifests: Array = [ type: 'modal', alias: 'Umb.Modal.ExamineFieldsSettings', name: 'Examine Field Settings Modal', - loader: () => import('./examine-management-dashboard/views/modal-views/fields-settings.element.js'), + js: () => import('./examine-management-dashboard/views/modal-views/fields-settings.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/search/umbraco-package.ts index 19cfeaa65d..d669951eaa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Search Bundle', alias: 'Umb.Bundle.Search', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/manifests.ts index d2313cc203..7bb4f3c0e3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/manifests.ts @@ -8,7 +8,7 @@ const dashboards: Array = [ alias: 'Umb.Dashboard.SettingsWelcome', name: 'Welcome Settings Dashboard', elementName: 'umb-dashboard-settings-welcome', - loader: () => import('./settings-welcome/dashboard-settings-welcome.element.js'), + js: () => import('./settings-welcome/dashboard-settings-welcome.element.js'), weight: 500, meta: { label: 'Welcome', @@ -26,7 +26,7 @@ const dashboards: Array = [ alias: 'Umb.Dashboard.ModelsBuilder', name: 'Models Builder Dashboard', elementName: 'umb-dashboard-models-builder', - loader: () => import('./models-builder/dashboard-models-builder.element.js'), + js: () => import('./models-builder/dashboard-models-builder.element.js'), weight: 300, meta: { label: 'Models Builder', @@ -44,7 +44,7 @@ const dashboards: Array = [ alias: 'Umb.Dashboard.PublishedStatus', name: 'Published Status Dashboard', elementName: 'umb-dashboard-published-status', - loader: () => import('./published-status/dashboard-published-status.element.js'), + js: () => import('./published-status/dashboard-published-status.element.js'), weight: 200, meta: { label: 'Published Status', @@ -62,7 +62,7 @@ const dashboards: Array = [ alias: 'Umb.Dashboard.Profiling', name: 'Profiling', elementName: 'umb-dashboard-performance-profiling', - loader: () => import('./performance-profiling/dashboard-performance-profiling.element.js'), + js: () => import('./performance-profiling/dashboard-performance-profiling.element.js'), weight: 101, meta: { label: 'Profiling', @@ -80,7 +80,7 @@ const dashboards: Array = [ alias: 'Umb.Dashboard.Telemetry', name: 'Telemetry', elementName: 'umb-dashboard-telemetry', - loader: () => import('./telemetry/dashboard-telemetry.element.js'), + js: () => import('./telemetry/dashboard-telemetry.element.js'), weight: 100, meta: { label: 'Telemetry Data', diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/manifests.ts index f4b524ef3f..a17fec91ab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/manifests.ts @@ -21,7 +21,7 @@ const entityActions: Array = [ type: 'modal', alias: 'Umb.Modal.DataTypeCreateOptions', name: 'Data Type Create Options Modal', - loader: () => import('./modal/data-type-create-options-modal.element.js'), + js: () => import('./modal/data-type-create-options-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/manifests.ts index 7abab6de4a..d612586eaa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/manifests.ts @@ -5,19 +5,19 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.PropertyEditorUiPicker', name: 'Property Editor UI Picker Modal', - loader: () => import('./property-editor-ui-picker/property-editor-ui-picker-modal.element.js'), + js: () => import('./property-editor-ui-picker/property-editor-ui-picker-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.DataTypePickerFlow', name: 'Data Type Picker Flow Modal', - loader: () => import('./data-type-picker-flow/data-type-picker-flow-modal.element.js'), + js: () => import('./data-type-picker-flow/data-type-picker-flow-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.DataTypePickerFlowDataTypePicker', name: 'Data Type Picker Flow UI Picker Modal', - loader: () => import('./data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.js'), + js: () => import('./data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/manifests.ts index 738944b871..95535d4ec1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/manifests.ts @@ -11,7 +11,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: DATA_TYPE_WORKSPACE_ALIAS, name: 'Data Type Workspace', - loader: () => import('./data-type-workspace.element.js'), + js: () => import('./data-type-workspace.element.js'), meta: { entityType: 'data-type', }, @@ -22,7 +22,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.DataType.Edit', name: 'Data Type Workspace Edit View', - loader: () => import('./views/details/data-type-details-workspace-view.element.js'), + js: () => import('./views/details/data-type-details-workspace-view.element.js'), weight: 90, meta: { label: 'Details', @@ -40,7 +40,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.DataType.Info', name: 'Data Type Workspace Info View', - loader: () => import('./views/info/workspace-view-data-type-info.element.js'), + js: () => import('./views/info/workspace-view-data-type-info.element.js'), weight: 90, meta: { label: 'Info', diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/manifests.ts index 02adb59cb3..66c8d376a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/manifests.ts @@ -8,7 +8,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.ExtensionRoot', name: 'Extension Root Workspace', - loader: () => import('./extension-root-workspace.element.js'), + js: () => import('./extension-root-workspace.element.js'), meta: { entityType: 'extension-root', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/app-language-select/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/app-language-select/manifests.ts index b305273eb4..0b8ec9fa4d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/app-language-select/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/app-language-select/manifests.ts @@ -5,13 +5,13 @@ const entityActions: Array = [ type: 'globalContext', alias: 'Umb.GlobalContext.AppLanguage', name: 'App Language Context', - loader: () => import('./app-language.context.js'), + js: () => import('./app-language.context.js'), }, { type: 'sectionSidebarApp', alias: 'Umb.SectionSidebarItem.LanguageSelect', name: 'App Language Select Section Sidebar Item', - loader: () => import('./app-language-select.element.js'), + js: () => import('./app-language-select.element.js'), weight: 900, conditions: [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/modals/manifests.ts index da1c68abcd..7f415a3e19 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/modals/manifests.ts @@ -5,7 +5,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.LanguagePicker', name: 'Language Picker Modal', - loader: () => import('./language-picker/language-picker-modal.element.js'), + js: () => import('./language-picker/language-picker-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language-root/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language-root/manifests.ts index ce8e2bc4ad..422bf207cc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language-root/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language-root/manifests.ts @@ -8,7 +8,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.LanguageRoot', name: 'Language Root Workspace', - loader: () => import('./language-root-workspace.element.js'), + js: () => import('./language-root-workspace.element.js'), meta: { entityType: 'language-root', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/manifests.ts index fb4abedcfd..36e2637ca6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.Language', name: 'Language Workspace', - loader: () => import('./language-workspace.element.js'), + js: () => import('./language-workspace.element.js'), meta: { entityType: 'language', }, @@ -20,7 +20,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Language.Details', name: 'Language Workspace Details View', - loader: () => import('./views/details/language-details-workspace-view.element.js'), + js: () => import('./views/details/language-details-workspace-view.element.js'), weight: 90, meta: { label: 'Details', diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/manifests.ts index b9d478a1c1..f0461fb833 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.RelationType', name: 'Relation Type Workspace', - loader: () => import('./relation-type-workspace.element.js'), + js: () => import('./relation-type-workspace.element.js'), meta: { entityType: 'relation-type', }, @@ -20,7 +20,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.RelationType.RelationType', name: 'Relation Type Workspace RelationType View', - loader: () => import('./views/relation-type/relation-type-workspace-view-relation-type.element.js'), + js: () => import('./views/relation-type/relation-type-workspace-view-relation-type.element.js'), weight: 20, meta: { label: 'RelationType', @@ -38,7 +38,7 @@ const workspaceViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.RelationType.Relation', name: 'Relation Type Workspace Relation View', - loader: () => import('./views/relation/workspace-view-relation-type-relation.element.js'), + js: () => import('./views/relation/workspace-view-relation-type-relation.element.js'), weight: 10, meta: { label: 'Relation', diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/umbraco-package.ts index 3d01bae2f8..87a8be3eec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Settings Bundle', alias: 'Umb.Bundle.Settings', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/config/storage-type/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/config/storage-type/manifests.ts index 979b9b3994..15692889bf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/config/storage-type/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/config/storage-type/manifests.ts @@ -5,7 +5,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Tags.StorageType', name: 'Tags Storage Type Property Editor UI', - loader: () => import('./property-editor-ui-tags-storage-type.element.js'), + js: () => import('./property-editor-ui-tags-storage-type.element.js'), meta: { label: 'Tags Storage Type', propertyEditorSchemaAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/manifests.ts index 66d19b9ffe..2d5aa1437e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/manifests.ts @@ -5,7 +5,7 @@ const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.Tags', name: 'Tags Property Editor UI', - loader: () => import('./property-editor-ui-tags.element.js'), + js: () => import('./property-editor-ui-tags.element.js'), meta: { label: 'Tags', propertyEditorSchemaAlias: 'Umbraco.Tags', diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/umbraco-package.ts index 98bf4437db..5706abda93 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/umbraco-package.ts @@ -5,6 +5,6 @@ export const extensions = [ name: 'Tags Management Bundle', alias: 'Umb.Bundle.TagsManagement', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/modals/manifests.ts index d363d7ee17..fefe77b850 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/modals/manifests.ts @@ -9,19 +9,19 @@ const modals: Array = [ type: 'modal', alias: UMB_MODAL_TEMPLATING_INSERT_CHOOSE_TYPE_SIDEBAR_ALIAS, name: 'Choose insert type sidebar', - loader: () => import('./insert-choose-type-sidebar.element.js'), + js: () => import('./insert-choose-type-sidebar.element.js'), }, { type: 'modal', alias: UMB_PARTIAL_VIEW_PICKER_MODAL_ALIAS, name: 'Partial View Picker Modal', - loader: () => import('../../templating/modals/partial-view-picker-modal.element.js'), + js: () => import('../../templating/modals/partial-view-picker-modal.element.js'), }, { type: 'modal', alias: UMB_MODAL_TEMPLATING_INSERT_SECTION_SIDEBAR_ALIAS, name: 'Partial Insert Section Picker Modal', - loader: () => import('./insert-section-modal/insert-section-modal.element.js'), + js: () => import('./insert-section-modal/insert-section-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/manifests.ts index 9a16ac00c7..d1fa85d1e7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/manifests.ts @@ -93,7 +93,7 @@ const createFromSnippetActionModal = { type: 'modal', alias: 'Umb.Modal.CreateFromSnippetPartialView', name: 'Choose insert type sidebar', - loader: () => import('./create/create-from-snippet.modal.js'), + js: () => import('./create/create-from-snippet.modal.js'), }; export const manifests = [...partialViewActions, ...partialViewFolderActions, createFromSnippetActionModal]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/manifests.ts index aa4bdfc898..2053e4feba 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/manifests.ts @@ -5,7 +5,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.PartialView', name: 'Partial View Workspace', - loader: () => import('./partial-view-workspace.element.js'), + js: () => import('./partial-view-workspace.element.js'), meta: { entityType: 'partial-view', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/manifests.ts index 5d49ee7b25..2c1d29cc3b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/manifests.ts @@ -6,7 +6,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: SCRIPTS_WORKSPACE_ALIAS, name: 'Scripts Workspace', - loader: () => import('./scripts-workspace.element.js'), + js: () => import('./scripts-workspace.element.js'), meta: { entityType: SCRIPTS_ENTITY_TYPE, }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/manifests.ts index 6795b5acf6..1fb5df185b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/manifests.ts @@ -10,7 +10,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.StyleSheet', name: 'Stylesheet Workspace', - loader: () => import('./stylesheet-workspace.element.js'), + js: () => import('./stylesheet-workspace.element.js'), meta: { entityType: 'stylesheet', }, @@ -21,7 +21,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Stylesheet.CodeEditor', name: 'Stylesheet Workspace Code Editor View', - loader: () => import('./views/code-editor/stylesheet-workspace-view-code-editor.element.js'), + js: () => import('./views/code-editor/stylesheet-workspace-view-code-editor.element.js'), weight: 700, meta: { label: 'Code', @@ -39,7 +39,7 @@ const workspaceEditorViews: Array = [ type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Stylesheet.RichTextEditor', name: 'Stylesheet Workspace Rich Text Editor View', - loader: () => import('./views/rich-text-editor/stylesheet-workspace-view-rich-text-editor.element.js'), + js: () => import('./views/rich-text-editor/stylesheet-workspace-view-rich-text-editor.element.js'), weight: 800, meta: { label: 'Rich Text Editor', diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/manifests.ts index 5a506a54ec..3262600c7e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/manifests.ts @@ -7,7 +7,7 @@ const modals: Array = [ type: 'modal', alias: UMB_MODAL_TEMPLATING_QUERY_BUILDER_SIDEBAR_ALIAS, name: 'Template query builder', - loader: () => import('./query-builder/query-builder.element.js'), + js: () => import('./query-builder/query-builder.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/manifests.ts index 08cc983f92..def1036755 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.Template', name: 'Template Workspace', - loader: () => import('./template-workspace.element.js'), + js: () => import('./template-workspace.element.js'), meta: { entityType: 'template', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/umbraco-package.ts index f5925d9135..7c36d4038e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Template Management Bundle', alias: 'Umb.Bundle.TemplateManagement', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/manifests.ts index 079cf078d5..28644423d9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/manifests.ts @@ -4,7 +4,7 @@ export const dashboard: ManifestDashboard = { type: 'dashboard', alias: 'Umb.Dashboard.UmbracoNews', name: 'Umbraco News Dashboard', - loader: () => import('./umbraco-news-dashboard.element.js'), + js: () => import('./umbraco-news-dashboard.element.js'), weight: 20, meta: { label: 'Welcome', diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-package.ts index 0439c11cd4..dd74ae2886 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-package.ts @@ -4,6 +4,6 @@ export const extensions = [ name: 'Umbraco News Bundle', alias: 'Umb.Bundle.UmbracoNews', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/manifests.ts index f6fe418913..c664e0a906 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/manifests.ts @@ -7,13 +7,13 @@ export const headerApps: Array = [ type: 'store', alias: 'Umb.Store.CurrentUser', name: 'Current User Store', - loader: () => import('./current-user-history.store.js'), + js: () => import('./current-user-history.store.js'), }, { type: 'headerApp', alias: 'Umb.HeaderApp.CurrentUser', name: 'Current User', - loader: () => import('./current-user-header-app.element.js'), + js: () => import('./current-user-header-app.element.js'), weight: 0, meta: { label: 'TODO: how should we enable this to not be set.', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts index b2fc561678..56ff4f54b3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts @@ -5,7 +5,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.User.Current', name: 'Current User Modal', - loader: () => import('./current-user/current-user-modal.element.js'), + js: () => import('./current-user/current-user-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/manifests.ts index 7fd6433ee6..bc3f9d482a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/manifests.ts @@ -5,7 +5,7 @@ export const userProfileApps: Array = [ type: 'userProfileApp', alias: 'Umb.UserProfileApp.profile', name: 'Profile User Profile App', - loader: () => import('./user-profile-app-profile.element.js'), + js: () => import('./user-profile-app-profile.element.js'), weight: 900, meta: { label: 'Profile User Profile App', @@ -16,7 +16,7 @@ export const userProfileApps: Array = [ type: 'userProfileApp', alias: 'Umb.UserProfileApp.ExternalLoginProviders', name: 'External Login Providers User Profile App', - loader: () => import('./user-profile-app-external-login-providers.element.js'), + js: () => import('./user-profile-app-external-login-providers.element.js'), weight: 800, meta: { label: 'External Login Providers User Profile App', @@ -27,7 +27,7 @@ export const userProfileApps: Array = [ type: 'userProfileApp', alias: 'Umb.UserProfileApp.Themes', name: 'Themes User Profile App', - loader: () => import('./user-profile-app-themes.element.js'), + js: () => import('./user-profile-app-themes.element.js'), weight: 200, meta: { label: 'Themes User Profile App', @@ -38,7 +38,7 @@ export const userProfileApps: Array = [ type: 'userProfileApp', alias: 'Umb.UserProfileApp.History', name: 'History User Profile App', - loader: () => import('./user-profile-app-history.element.js'), + js: () => import('./user-profile-app-history.element.js'), weight: 100, meta: { label: 'History User Profile App', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/modals/manifests.ts index 5154cb2bab..aa086f1d21 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/modals/manifests.ts @@ -5,7 +5,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.ChangePassword', name: 'Change Password Modal', - loader: () => import('./change-password/change-password-modal.element.js'), + js: () => import('./change-password/change-password-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/user/umbraco-package.ts index 7418be463d..21c953c36f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/umbraco-package.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/umbraco-package.ts @@ -5,6 +5,6 @@ export const extensions = [ name: 'User Management Bundle', alias: 'Umb.Bundle.UserManagement', type: 'bundle', - loader: () => import('./manifests.js'), + js: () => import('./manifests.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/manifests.ts index 3ca7f7c040..82fd2b5cba 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/manifests.ts @@ -5,7 +5,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.UserGroupPicker', name: 'User Group Picker Modal', - loader: () => import('./user-group-picker/user-group-picker-modal.element.js'), + js: () => import('./user-group-picker/user-group-picker-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts index 91ba844f04..a32081ef3b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/manifests.ts @@ -6,7 +6,7 @@ const sectionsViews: Array = [ type: 'sectionView', alias: 'Umb.SectionView.UserGroups', name: 'User Groups Section View', - loader: () => import('./user-groups-section-view.element.js'), + js: () => import('./user-groups-section-view.element.js'), weight: 100, meta: { label: 'User Groups', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts index f55239e92f..58ba05612a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts @@ -9,7 +9,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.UserGroup', name: 'User Group Workspace', - loader: () => import('./user-group-workspace.element.js'), + js: () => import('./user-group-workspace.element.js'), meta: { entityType: 'user-group', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/modals/manifests.ts index ca7d2173bf..152cdbe431 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/modals/manifests.ts @@ -3,6 +3,6 @@ export const manifests = [ type: 'modal', alias: 'Umb.Modal.EntityUserPermissionSettings', name: 'Entity User Permission Settings Modal', - loader: () => import('./entity-user-permission-settings/entity-user-permission-settings-modal.element.js'), + js: () => import('./entity-user-permission-settings/entity-user-permission-settings-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts index 0ddd3ac0b1..5b10cbd2c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts @@ -5,31 +5,33 @@ const tableCollectionView: ManifestCollectionView = { type: 'collectionView', alias: 'Umb.CollectionView.UserTable', name: 'User Table Collection Collection View', - loader: () => import('./table/user-table-collection-view.element.js'), + js: () => import('./table/user-table-collection-view.element.js'), meta: { label: 'Table', icon: 'icon-box', pathName: 'table', }, - conditions: { - entityType: UMB_USER_ENTITY_TYPE, - }, + conditions: [{ + alias: 'Umb.Condition.WorkspaceEntityType', + match: UMB_USER_ENTITY_TYPE, + }], }; const gridCollectionView: ManifestCollectionView = { type: 'collectionView', alias: 'Umb.CollectionView.UserGrid', name: 'Media Table Collection View', - loader: () => import('./grid/user-grid-collection-view.element.js'), + js: () => import('./grid/user-grid-collection-view.element.js'), weight: 200, meta: { label: 'Grid', icon: 'icon-grid', pathName: 'grid', }, - conditions: { - entityType: UMB_USER_ENTITY_TYPE, - }, + conditions: [{ + alias: 'Umb.Condition.WorkspaceEntityType', + match: UMB_USER_ENTITY_TYPE, + }], }; export const manifests = [tableCollectionView, gridCollectionView]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts index 629257a3e5..b8bde4b0a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts @@ -5,31 +5,31 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.User.Create', name: 'Create User Modal', - loader: () => import('./create/user-create-modal.element.js'), + js: () => import('./create/user-create-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.User.CreateSuccess', name: 'Create Success User Modal', - loader: () => import('./create/user-create-success-modal.element.js'), + js: () => import('./create/user-create-success-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.User.Invite', name: 'Invite User Modal', - loader: () => import('./invite/user-invite-modal.element.js'), + js: () => import('./invite/user-invite-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.User.ResendInvite', name: 'Resend Invite to User Modal', - loader: () => import('./resend-invite/resend-invite-to-user-modal.element.js'), + js: () => import('./resend-invite/resend-invite-to-user-modal.element.js'), }, { type: 'modal', alias: 'Umb.Modal.User.Picker', name: 'User Picker Modal', - loader: () => import('./user-picker/user-picker-modal.element.js'), + js: () => import('./user-picker/user-picker-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts index 1990276631..3db7ef495c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/manifests.ts @@ -6,7 +6,7 @@ const sectionsViews: Array = [ type: 'sectionView', alias: 'Umb.SectionView.Users', name: 'Users Section View', - loader: () => import('./users-section-view.element.js'), + js: () => import('./users-section-view.element.js'), weight: 200, meta: { label: 'Users', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts index 87a3718fd2..bbaefa4b57 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts @@ -10,7 +10,7 @@ const workspace: ManifestWorkspace = { type: 'workspace', alias: 'Umb.Workspace.User', name: 'User Workspace', - loader: () => import('./user-workspace.element.js'), + js: () => import('./user-workspace.element.js'), meta: { entityType: USER_ENTITY_TYPE, },