From 619bb1e1fdabb54403fe84da0984bebb53e461b0 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Mon, 8 Apr 2024 17:16:47 +0200
Subject: [PATCH] load the core package entrypoint directly to avoid using the
 entrypoint initializer and thereby affecting all third party entrypoints

---
 .../src/apps/app/app.element.ts               | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
index 901ab5b0e5..f33d0b672f 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
@@ -1,4 +1,4 @@
-import { extensions as coreExtensions } from '../../packages/core/umbraco-package.js';
+import { onInit } from '../../packages/core/index.js';
 import type { UmbAppErrorElement } from './app-error.element.js';
 import { UmbAppContext } from './app.context.js';
 import { UmbServerConnection } from './server-connection.js';
@@ -13,22 +13,11 @@ import type { Guard, UmbRoute } from '@umbraco-cms/backoffice/router';
 import { pathWithoutBasePath } from '@umbraco-cms/backoffice/router';
 import { OpenAPI, RuntimeLevelModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { UmbContextDebugController } from '@umbraco-cms/backoffice/debug';
-import {
-	UmbBundleExtensionInitializer,
-	UmbEntryPointExtensionInitializer,
-	UmbServerExtensionRegistrator,
-} from '@umbraco-cms/backoffice/extension-api';
+import { UmbServerExtensionRegistrator } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 
 @customElement('umb-app')
 export class UmbAppElement extends UmbLitElement {
-	/**
-	 * Backoffice extension registry.
-	 * This enables to register and unregister extensions via DevTools, or just via querying this element via the DOM.
-	 * @type {UmbExtensionsRegistry}
-	 */
-	public extensionRegistry = umbExtensionsRegistry;
-
 	/**
 	 * The base URL of the configured Umbraco server.
 	 *
@@ -87,11 +76,6 @@ export class UmbAppElement extends UmbLitElement {
 		new UUIIconRegistryEssential().attach(this);
 
 		new UmbContextDebugController(this);
-
-		new UmbBundleExtensionInitializer(this, umbExtensionsRegistry);
-		new UmbEntryPointExtensionInitializer(this, umbExtensionsRegistry);
-
-		umbExtensionsRegistry.registerMany(coreExtensions);
 	}
 
 	connectedCallback(): void {
@@ -105,6 +89,10 @@ export class UmbAppElement extends UmbLitElement {
 		this.#authContext = new UmbAuthContext(this, this.serverUrl, this.backofficePath, this.bypassAuth);
 		new UmbAppContext(this, { backofficePath: this.backofficePath, serverUrl: this.serverUrl });
 
+		// Register Core extensions
+		onInit(this, umbExtensionsRegistry);
+
+		// Register public extensions
 		await new UmbServerExtensionRegistrator(this, umbExtensionsRegistry).registerPublicExtensions();
 
 		// Try to initialise the auth flow and get the runtime status
@@ -202,7 +190,7 @@ export class UmbAppElement extends UmbLitElement {
 	}
 
 	#isAuthorizedGuard(): Guard {
-		return () => this.#authController?.isAuthorized() ?? false;
+		return () => this.#authController.isAuthorized() ?? false;
 	}
 
 	#errorPage(errorMsg: string, error?: unknown) {