From 7a219dda29d60604548540c8df419c0c6cd40f3b Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 23 Jan 2023 14:51:39 +0100 Subject: [PATCH] move extensions-registry to libs --- .../libs/controller/package.json | 2 +- .../collection-bulk-action.models.ts | 0 .../collection-view.models.ts | 0 .../dashboard-collection.models.ts | 0 .../extensions-registry/dashboard.models.ts | 0 .../external-login-provider.models.ts | 0 .../extensions-registry/header-app.models.ts | 0 .../core => libs}/extensions-registry/index.ts | 0 .../core => libs}/extensions-registry/models.ts | 0 .../extensions-registry/package-view.models.ts | 0 .../libs/extensions-registry/package.json | 16 ++++++++++++++++ .../property-action.models.ts | 0 .../property-editor.models.ts | 0 .../libs/extensions-registry/rollup.config.js | 4 ++++ .../extensions-registry/section-view.models.ts | 0 .../extensions-registry/section.models.ts | 0 .../sidebar-menu-item.models.ts | 0 .../tree-item-action.models.ts | 0 .../extensions-registry/tree.models.ts | 0 .../extensions-registry/user-dashboard.models.ts | 0 .../workspace-action.models.ts | 0 .../workspace-view-collection.models.ts | 0 .../extensions-registry/workspace-view.models.ts | 0 .../extensions-registry/workspace.models.ts | 0 .../extension-slot/extension-slot.element.ts | 7 +++---- .../is-manifest-elementable-type.function.ts | 8 ++++---- .../is-manifest-js-type.function.ts | 6 +++--- .../is-manifest-loader-type.function.ts | 4 ++-- .../src/core/models/index.ts | 2 +- src/Umbraco.Web.UI.Client/tsconfig.json | 2 +- .../web-test-runner.config.mjs | 2 +- 31 files changed, 36 insertions(+), 17 deletions(-) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/collection-bulk-action.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/collection-view.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/dashboard-collection.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/dashboard.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/external-login-provider.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/header-app.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/index.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/package-view.models.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/libs/extensions-registry/package.json rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/property-action.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/property-editor.models.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/libs/extensions-registry/rollup.config.js rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/section-view.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/section.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/sidebar-menu-item.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/tree-item-action.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/tree.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/user-dashboard.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/workspace-action.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/workspace-view-collection.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/workspace-view.models.ts (100%) rename src/Umbraco.Web.UI.Client/{src/core => libs}/extensions-registry/workspace.models.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/libs/controller/package.json b/src/Umbraco.Web.UI.Client/libs/controller/package.json index 11bad2e628..45aa0f97eb 100644 --- a/src/Umbraco.Web.UI.Client/libs/controller/package.json +++ b/src/Umbraco.Web.UI.Client/libs/controller/package.json @@ -1,5 +1,5 @@ { - "name": "@umbraco-cms/controller", + "name": "@umbraco-cms/extensions-registry", "version": "0.0.0", "description": "", "module": "index.js", diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-bulk-action.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/collection-bulk-action.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-bulk-action.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/collection-bulk-action.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-view.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/collection-view.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-view.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/collection-view.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/dashboard-collection.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/dashboard-collection.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/dashboard-collection.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/dashboard-collection.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/dashboard.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/dashboard.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/dashboard.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/dashboard.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/external-login-provider.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/external-login-provider.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/external-login-provider.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/external-login-provider.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/header-app.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/header-app.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/header-app.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/header-app.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/index.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/index.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/package-view.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/package-view.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/package-view.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/package-view.models.ts diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/package.json b/src/Umbraco.Web.UI.Client/libs/extensions-registry/package.json new file mode 100644 index 0000000000..11bad2e628 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/extensions-registry/package.json @@ -0,0 +1,16 @@ +{ + "name": "@umbraco-cms/controller", + "version": "0.0.0", + "description": "", + "module": "index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "tsc && rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/property-action.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/property-action.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/property-action.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/property-action.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/property-editor.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/property-editor.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/property-editor.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/property-editor.models.ts diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/rollup.config.js b/src/Umbraco.Web.UI.Client/libs/extensions-registry/rollup.config.js new file mode 100644 index 0000000000..945c0afe88 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/extensions-registry/rollup.config.js @@ -0,0 +1,4 @@ +import config from '../../utils/rollup.config.js'; +export default { + ...config, +}; diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/section-view.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/section-view.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/section-view.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/section-view.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/section.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/section.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/section.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/section.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/sidebar-menu-item.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/sidebar-menu-item.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/sidebar-menu-item.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/sidebar-menu-item.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/tree-item-action.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/tree-item-action.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/tree-item-action.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/tree-item-action.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/tree.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/tree.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/tree.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/tree.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/user-dashboard.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/user-dashboard.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/user-dashboard.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/user-dashboard.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/workspace-action.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-action.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/workspace-action.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-action.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/workspace-view-collection.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-view-collection.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/workspace-view-collection.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-view-collection.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/workspace-view.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-view.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/workspace-view.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace-view.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/workspace.models.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace.models.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extensions-registry/workspace.models.ts rename to src/Umbraco.Web.UI.Client/libs/extensions-registry/workspace.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts index 795d5b2cae..d5cb2940e1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts @@ -1,7 +1,6 @@ -import { nothing } from 'lit'; +import { css, nothing } from 'lit'; import type { TemplateResult } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { css } from 'lit'; import { map } from 'rxjs'; import { repeat } from 'lit/directives/repeat.js'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; @@ -20,7 +19,6 @@ export type InitializedExtension = { alias: string; weight: number; component: H */ @customElement('umb-extension-slot') export class UmbExtensionSlotElement extends UmbLitElement { - static styles = css` :host { display: contents; @@ -40,7 +38,8 @@ export class UmbExtensionSlotElement extends UmbLitElement { public defaultElement = ''; @property() - public renderMethod: (manifest: InitializedExtension) => TemplateResult<1 | 2> | HTMLElement | null = (manifest) => manifest.component; + public renderMethod: (manifest: InitializedExtension) => TemplateResult<1 | 2> | HTMLElement | null = (manifest) => + manifest.component; connectedCallback(): void { super.connectedCallback(); diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-elementable-type.function.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-elementable-type.function.ts index 84454a5e57..529506a783 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-elementable-type.function.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-elementable-type.function.ts @@ -1,7 +1,7 @@ -import type { ManifestElement, ManifestBase } from "../extensions-registry/models"; -import { isManifestElementNameType } from "./is-manifest-element-name-type.function"; -import { isManifestJSType } from "./is-manifest-js-type.function"; -import { isManifestLoaderType } from "./is-manifest-loader-type.function"; +import type { ManifestElement, ManifestBase } from '@umbraco-cms/extensions-registry'; +import { isManifestElementNameType } from './is-manifest-element-name-type.function'; +import { isManifestJSType } from './is-manifest-js-type.function'; +import { isManifestLoaderType } from './is-manifest-loader-type.function'; export function isManifestElementableType(manifest: ManifestBase): manifest is ManifestElement { return isManifestElementNameType(manifest) || isManifestLoaderType(manifest) || isManifestJSType(manifest); diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-js-type.function.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-js-type.function.ts index f49e604547..6ca58caa11 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-js-type.function.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-js-type.function.ts @@ -1,6 +1,6 @@ -import type { ManifestBase } from "../extensions-registry/models"; -import { ManifestJSType } from "./load-extension.function"; +import type { ManifestBase } from '@umbraco-cms/extensions-registry'; +import { ManifestJSType } from './load-extension.function'; export function isManifestJSType(manifest: ManifestBase): manifest is ManifestJSType { return (manifest as ManifestJSType).js !== undefined; -} \ No newline at end of file +} diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-loader-type.function.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-loader-type.function.ts index 8303cb7e55..e5e03ba228 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-loader-type.function.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-manifest-loader-type.function.ts @@ -1,5 +1,5 @@ -import type { ManifestBase } from "../extensions-registry/models"; -import { ManifestLoaderType } from "./load-extension.function"; +import type { ManifestBase } from '@umbraco-cms/extensions-registry'; +import { ManifestLoaderType } from './load-extension.function'; export function isManifestLoaderType(manifest: ManifestBase): manifest is ManifestLoaderType { return typeof (manifest as ManifestLoaderType).loader === 'function'; diff --git a/src/Umbraco.Web.UI.Client/src/core/models/index.ts b/src/Umbraco.Web.UI.Client/src/core/models/index.ts index 6fe815ed33..bac83bed0d 100644 --- a/src/Umbraco.Web.UI.Client/src/core/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/core/models/index.ts @@ -8,7 +8,7 @@ import { } from '@umbraco-cms/backend-api'; // Extension Manifests -export * from '../extensions-registry/models'; +export * from '../../../libs/extensions-registry/models'; // eslint-disable-next-line @typescript-eslint/no-explicit-any export type HTMLElementConstructor = new (...args: any[]) => T; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 7a5db1449d..698021dc2e 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -26,7 +26,7 @@ "@umbraco-cms/controller": ["libs/controller"], "@umbraco-cms/element": ["src/core/element"], "@umbraco-cms/extensions-api": ["src/core/extensions-api"], - "@umbraco-cms/extensions-registry": ["src/core/extensions-registry"], + "@umbraco-cms/extensions-registry": ["libs/extensions-registry"], "@umbraco-cms/observable-api": ["libs/observable-api"], "@umbraco-cms/utils": ["src/core/utils"], "@umbraco-cms/test-utils": ["src/core/test-utils"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index d52924d597..7ac4133929 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -18,7 +18,7 @@ export default { '@umbraco-cms/controller': './libs/controller/index.ts', '@umbraco-cms/element': './src/core/element/index.ts', '@umbraco-cms/extensions-api': './src/core/extensions-api/index.ts', - '@umbraco-cms/extensions-registry': './src/core/extensions-registry/index.ts', + '@umbraco-cms/extensions-registry': './libs/extensions-registry/index.ts', '@umbraco-cms/observable-api': './libs/observable-api/index.ts', '@umbraco-cms/utils': './src/core/utils/index.ts', '@umbraco-cms/test-utils': './src/core/test-utils/index.ts',