Merge remote-tracking branch 'origin/main' into v15/feature/tiptap

Author: iOvergaard

examples/ufm-custom-component/index.ts

@@ -1,4 +1,4 @@
-import type { ManifestUfmComponent } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestUfmComponent } from '@umbraco-cms/backoffice/ufm';
 
 export const manifests: Array<ManifestUfmComponent> = [
 	{

src/packages/core/extension-registry/models/auth-provider.model.ts renamed to src/packages/core/auth/auth-provider.extension.ts

@@ -86,3 +86,9 @@ export interface MetaAuthProvider {
 		allowManualLinking?: boolean;
 	};
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbAuthProvider: ManifestAuthProvider;
+	}
+}

src/packages/core/auth/auth.context.ts

@@ -1,12 +1,13 @@
-import type { UmbBackofficeExtensionRegistry, ManifestAuthProvider } from '../extension-registry/index.js';
 import { UmbAuthFlow } from './auth-flow.js';
 import { UMB_AUTH_CONTEXT, UMB_STORAGE_TOKEN_RESPONSE_NAME } from './auth.context.token.js';
 import type { UmbOpenApiConfiguration } from './models/openApiConfiguration.js';
+import type { ManifestAuthProvider } from './auth-provider.extension.js';
 import { OpenAPI } from '@umbraco-cms/backoffice/external/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
 import { ReplaySubject, Subject, firstValueFrom, switchMap } from '@umbraco-cms/backoffice/external/rxjs';
+import type { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry';
 
 export class UmbAuthContext extends UmbContextBase<UmbAuthContext> {
 	#isAuthorized = new UmbBooleanState<boolean>(false);

src/packages/core/auth/components/auth-provider-default.element.ts

@@ -1,7 +1,7 @@
-import type { ManifestAuthProvider } from '../../extension-registry/models/index.js';
 import type { UmbAuthProviderDefaultProps, UmbUserLoginState } from '../types.js';
 import { UmbLitElement } from '../../lit-element/lit-element.element.js';
 import { UmbTextStyles } from '../../style/index.js';
+import type { ManifestAuthProvider } from '../auth-provider.extension.js';
 import { css, customElement, html, nothing, property } from '@umbraco-cms/backoffice/external/lit';
 
 @customElement('umb-auth-provider-default')

src/packages/core/auth/index.ts

@@ -5,5 +5,6 @@ export * from './auth.context.token.js';
 export * from './modals/index.js';
 export * from './models/openApiConfiguration.js';
 export * from './components/index.js';
+export * from './auth-provider.extension.js';
 
 export type * from './types.js';

src/packages/core/auth/modals/umb-app-auth-modal.element.ts

@@ -1,4 +1,4 @@
-import type { ManifestAuthProvider } from '../../extension-registry/models/auth-provider.model.js';
+import type { ManifestAuthProvider } from '../auth-provider.extension.js';
 import { UmbModalBaseElement } from '../../modal/index.js';
 import { UmbTextStyles } from '../../style/text-style.style.js';
 import { UMB_AUTH_CONTEXT } from '../auth.context.token.js';

src/packages/core/auth/providers/manifests.ts

@@ -1,4 +1,4 @@
-import type { ManifestAuthProvider } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestAuthProvider } from '../auth-provider.extension.js';
 
 export const manifests: Array<ManifestAuthProvider> = [
 	{

src/packages/core/auth/types.ts

@@ -1,4 +1,4 @@
-import type { ManifestAuthProvider } from '../extension-registry/index.js';
+import type { ManifestAuthProvider } from './auth-provider.extension.js';
 
 /**
  * User login state that can be used to determine the current state of the user.

src/packages/core/extension-registry/interfaces/external-login-provider-element.interface.ts renamed to src/packages/core/extension-registry/extensions/external-login-provider-element.interface.ts

@@ -1,4 +1,4 @@
-import type { ManifestExternalLoginProvider } from '../models/index.js';
+import type { ManifestExternalLoginProvider } from '../extensions/index.js';
 
 export interface UmbExternalLoginProviderElement extends HTMLElement {
 	manifest?: ManifestExternalLoginProvider;

src/packages/core/extension-registry/models/external-login-provider.model.ts renamed to src/packages/core/extension-registry/extensions/external-login-provider.extension.ts

@@ -1,4 +1,4 @@
-import type { UmbExternalLoginProviderElement } from '../interfaces/external-login-provider-element.interface.js';
+import type { UmbExternalLoginProviderElement } from './external-login-provider-element.interface.js';
 import type { ManifestElement } from '@umbraco-cms/backoffice/extension-api';
 
 export interface ManifestExternalLoginProvider extends ManifestElement<UmbExternalLoginProviderElement> {
@@ -10,3 +10,9 @@ export interface MetaExternalLoginProvider {
 	label: string;
 	pathname: string;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbExternalLoginProvider: ManifestExternalLoginProvider;
+	}
+}