merge fixes

src/Umbraco.Web.UI.Client/src/libs/extension-api/index.ts

@@ -8,5 +8,4 @@ export * from './create-extension-element-or-fallback.function';
 export * from './create-extension-class.function';
 export * from './umb-lifecycle.interface';
 export * from './entry-point-extension-initializer';
-export * from './extension-class-initializer';
 export * from './types';

src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/index.ts

@@ -0,0 +1 @@
+export * from './input-multi-url.element';

src/Umbraco.Web.UI.Client/src/packages/core/components/property-creator/index.ts

@@ -1 +0,0 @@
-export * from './property-creator.element';

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

@@ -1,7 +1,12 @@
-import { ManifestTypes, umbExtensionsRegistry } from '../extension-registry';
-import { UmbObserverController } from '../observable-api';
-import { createExtensionClass } from './create-extension-class.function';
-import { ManifestBase, ManifestClass, SpecificManifestTypeOrManifestBase } from './types';
+import type { ManifestTypes } from './models';
+import { umbExtensionsRegistry } from './registry';
+import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
+import {
+	createExtensionClass,
+	ManifestBase,
+	ManifestClass,
+	SpecificManifestTypeOrManifestBase,
+} from '@umbraco-cms/backoffice/extension-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 
 export class UmbExtensionClassInitializer<

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

@@ -1,3 +1,4 @@
 export * from './interfaces';
 export * from './models';
 export * from './registry';
+export * from './extension-class-initializer';

src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts

@@ -1,9 +1,9 @@
 // eslint-disable-next-line local-rules/no-external-imports
 import type { IRouterSlot } from 'router-slot/model';
-import { encodeFolderName } from '@umbraco-cms/backoffice/router';
 import { UmbModalHandler } from './modal-handler';
 import { UmbModalConfig, UmbModalContext } from './modal.context';
 import { UmbModalToken } from './token/modal-token';
+import { encodeFolderName } from '@umbraco-cms/backoffice/router';
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import type { Params } from '@umbraco-cms/backoffice/router';
 

src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts

@@ -5,8 +5,7 @@ import { repeat } from 'lit/directives/repeat.js';
 import { UmbDocumentTypeWorkspaceContext } from '../../document-type-workspace.context';
 import type { UmbDocumentTypeWorkspaceViewEditTabElement } from './document-type-workspace-view-edit-tab.element';
 import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type';
-import { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router';
-import { encodeFolderName } from '@umbraco-cms/backoffice/router';
+import { encodeFolderName, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { PropertyTypeContainerResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';

src/Umbraco.Web.UI.Client/src/shared/repository/repository-items.manager.ts

@@ -1,7 +1,7 @@
 import { UmbItemRepository } from '@umbraco-cms/backoffice/repository';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbArrayState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
-import { UmbExtensionClassInitializer } from '@umbraco-cms/backoffice/extension-api';
+import { UmbExtensionClassInitializer } from '@umbraco-cms/backoffice/extension-registry';
 import { ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export class UmbRepositoryItemsManager<ItemType extends ItemResponseModelBaseModel> {

src/Umbraco.Web.UI.Client/src/shared/router/index.ts

@@ -9,6 +9,7 @@ export type {
 	IComponentRoute,
 	IRedirectRoute,
 	IResolverRoute,
+	IRouterSlot,
 	Params,
 	Query,
 } from 'router-slot/model';
@@ -16,3 +17,4 @@ export * from 'router-slot/util';
 export * from './route.context';
 export * from './route.interface';
 export * from './generate-route-path-builder.function';
+export * from './encode-folder-name.function';