From 718ae4637b3b33e14cb0dbc44c0ada5c89c3eeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 22 Mar 2022 16:01:41 +0100
Subject: [PATCH] MOBILE-3814 core: Fix providers not found

---
 src/core/core.module.ts                       | 4 ----
 src/core/features/compile/services/compile.ts | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/core.module.ts b/src/core/core.module.ts
index aa68a6e2a..44ca6128e 100644
--- a/src/core/core.module.ts
+++ b/src/core/core.module.ts
@@ -33,7 +33,6 @@ import { CoreFileHelperProvider } from '@services/file-helper';
 import { CoreFilepoolProvider } from '@services/filepool';
 import { CoreFileProvider } from '@services/file';
 import { CoreFileSessionProvider } from '@services/file-session';
-import { CoreForms } from '@singletons/form';
 import { CoreGeolocationProvider } from '@services/geolocation';
 import { CoreGroupsProvider } from '@services/groups';
 import { CoreIframeUtilsProvider } from '@services/utils/iframe';
@@ -51,11 +50,9 @@ import { CoreUpdateManagerProvider } from '@services/update-manager';
 import { CoreUrlUtilsProvider } from '@services/utils/url';
 import { CoreUtilsProvider } from '@services/utils/utils';
 import { CoreWSProvider } from '@services/ws';
-import { CoreComponentsRegistry } from '@singletons/components-registry';
 
 export const CORE_SERVICES: Type<unknown>[] = [
     CoreAppProvider,
-    CoreComponentsRegistry,
     CoreConfigProvider,
     CoreCronDelegateService,
     CoreCustomURLSchemesProvider,
@@ -65,7 +62,6 @@ export const CORE_SERVICES: Type<unknown>[] = [
     CoreFilepoolProvider,
     CoreFileProvider,
     CoreFileSessionProvider,
-    CoreForms,
     CoreGeolocationProvider,
     CoreGroupsProvider,
     CoreIframeUtilsProvider,
diff --git a/src/core/features/compile/services/compile.ts b/src/core/features/compile/services/compile.ts
index 0f9f72c22..4be7f3875 100644
--- a/src/core/features/compile/services/compile.ts
+++ b/src/core/features/compile/services/compile.ts
@@ -79,6 +79,9 @@ import { Md5 } from 'ts-md5/dist/md5';
 // Import core classes that can be useful for site plugins.
 import { CoreSyncBaseProvider } from '@classes/base-sync';
 import { CoreArray } from '@singletons/array';
+import { CoreComponentsRegistry } from '@singletons/components-registry';
+import { CoreDom } from '@singletons/dom';
+import { CoreForms } from '@singletons/form';
 import { CoreText } from '@singletons/text';
 import { CoreUrl } from '@singletons/url';
 import { CoreWindow } from '@singletons/window';
@@ -151,7 +154,6 @@ import { ADDON_PRIVATEFILES_SERVICES } from '@addons/privatefiles/privatefiles.m
 // Import some addon modules that define components, directives and pipes. Only import the important ones.
 import { AddonModAssignComponentsModule } from '@addons/mod/assign/components/components.module';
 import { AddonModWorkshopComponentsModule } from '@addons/mod/workshop/components/components.module';
-import { CoreDom } from '@singletons/dom';
 
 /**
  * Service to provide functionalities regarding compiling dynamic HTML and Javascript.
@@ -342,7 +344,9 @@ export class CoreCompileProvider {
         instance['Md5'] = Md5;
         instance['CoreSyncBaseProvider'] = CoreSyncBaseProvider;
         instance['CoreArray'] = CoreArray;
+        instance['CoreComponentsRegistry'] = CoreComponentsRegistry;
         instance['CoreDom'] = CoreDom;
+        instance['CoreForms'] = CoreForms;
         instance['CoreText'] = CoreText;
         instance['CoreUrl'] = CoreUrl;
         instance['CoreWindow'] = CoreWindow;