@@ -41,14 +41,16 @@ import { CoreEvents } from '@singletons/events';
4141import { makeSingleton } from '@singletons' ;
4242import { effectWithInjectionContext , modelWithInjectionContext } from '@/core/utils/signals' ;
4343
44- // Import core services.
44+ // Import core services and exported directives/objects.
45+ import { CoreSharedModule } from '@/core/shared.module' ;
46+ import { getCoreDeprecatedComponents } from '@components/components.module' ;
4547import { getCoreExportedObjects , getCoreServices } from '@/core/core.module' ;
46- import { getBlockServices } from '@features/block/block.module' ;
48+ import { getBlockExportedDirectives , getBlockServices } from '@features/block/block.module' ;
4749import { getCommentsServices } from '@features/comments/comments.module' ;
4850import { getContentLinksExportedObjects , getContentLinksServices } from '@features/contentlinks/contentlinks.module' ;
49- import { getCourseExportedObjects , getCourseServices , getCourseStandaloneComponents } from '@features/course/course.module' ;
50- import { getCoursesExportedObjects , getCoursesServices } from '@features/courses/courses.module' ;
51- import { getEditorServices } from '@features/editor/editor.module' ;
51+ import { getCourseExportedObjects , getCourseServices , getCourseExportedDirectives } from '@features/course/course.module' ;
52+ import { getCoursesExportedDirectives , getCoursesExportedObjects , getCoursesServices } from '@features/courses/courses.module' ;
53+ import { getEditorExportedDirectives , getEditorServices } from '@features/editor/editor.module' ;
5254import { getEnrolServices } from '@features/enrol/enrol.module' ;
5355import { getFileUploadedServices } from '@features/fileuploader/fileuploader.module' ;
5456import { getFilterServices } from '@features/filter/filter.module' ;
@@ -58,15 +60,16 @@ import { getLoginServices } from '@features/login/login.module';
5860import { getMainMenuExportedObjects , getMainMenuServices } from '@features/mainmenu/mainmenu.module' ;
5961import { getNativeServices } from '@features/native/native.module' ;
6062import { getPushNotificationsServices } from '@features/pushnotifications/pushnotifications.module' ;
61- import { getQuestionServices } from '@features/question/question.module' ;
63+ import { getQuestionExportedDirectives , getQuestionServices } from '@features/question/question.module' ;
6264import { getRatingServices } from '@features/rating/rating.module' ;
63- import { getSearchServices } from '@features/search/search.module' ;
65+ import { getRemindersExportedDirectives , getRemindersServices } from '@features/reminders/reminders.module' ;
66+ import { getSearchExportedDirectives , getSearchServices } from '@features/search/search.module' ;
6467import { getSettingsServices } from '@features/settings/settings.module' ;
6568import { getSharedFilesServices } from '@features/sharedfiles/sharedfiles.module' ;
6669import { getSiteHomeServices } from '@features/sitehome/sitehome.module' ;
6770import { getStyleServices } from '@features/styles/styles.module' ;
6871import { getTagServices } from '@features/tag/tag.module' ;
69- import { getUsersServices } from '@features/user/user.module' ;
72+ import { getUsersExportedDirectives , getUsersServices } from '@features/user/user.module' ;
7073import { getXAPIServices } from '@features/xapi/xapi.module' ;
7174
7275// Import other libraries and providers.
@@ -104,17 +107,6 @@ import { CoreWait } from '@singletons/wait';
104107import { CoreWindow } from '@singletons/window' ;
105108import { getCoreErrorsExportedObjects } from '@classes/errors/errors' ;
106109
107- // Import all core modules that define components, directives and pipes.
108- import { CoreSharedModule } from '@/core/shared.module' ;
109- import { CoreCourseComponentsModule } from '@features/course/components/components.module' ;
110- import { CoreCourseDirectivesModule } from '@features/course/directives/directives.module' ;
111- import { CoreCoursesComponentsModule } from '@features/courses/components/components.module' ;
112- import { CoreUserComponentsModule } from '@features/user/components/components.module' ;
113- import { CoreQuestionComponentsModule } from '@features/question/components/components.module' ;
114- import { CoreBlockComponentsModule } from '@features/block/components/components.module' ;
115- import { CoreEditorComponentsModule } from '@features/editor/components/components.module' ;
116- import { CoreSearchComponentsModule } from '@features/search/components/components.module' ;
117-
118110// Import addon providers. Do not import database module because it causes circular dependencies.
119111import { getBadgesServices } from '@addons/badges/badges.module' ;
120112import { getCalendarServices } from '@addons/calendar/calendar.module' ;
@@ -129,16 +121,13 @@ import { getNotesServices } from '@addons/notes/notes.module';
129121import { getNotificationsServices } from '@addons/notifications/notifications.module' ;
130122import { getPrivateFilesServices } from '@addons/privatefiles/privatefiles.module' ;
131123
132- // Import standalone components used by site plugins.
133- import { getCoreStandaloneComponents } from '@components/components.module' ;
134-
135124// Import some addon modules that define components, directives and pipes. Only import the important ones.
136125import { CorePromisedValue } from '@classes/promised-value' ;
137126import { CorePlatform } from '@services/platform' ;
138127
139128import { CoreAutoLogoutService } from '@features/autologout/services/autologout' ;
140129import {
141- getSitePluginsDirectives ,
130+ getSitePluginsExportedDirectives ,
142131 getSitePluginsExportedObjects ,
143132 getSitePluginsServices ,
144133} from '@features/siteplugins/siteplugins.module' ;
@@ -161,20 +150,19 @@ export class CoreCompileProvider {
161150 // List of imports for dynamic module. Since the template can have any component we need to import all core components modules.
162151 protected readonly IMPORTS = [
163152 CoreSharedModule ,
164- CoreCourseComponentsModule ,
165- CoreCoursesComponentsModule ,
166- CoreUserComponentsModule ,
167- CoreCourseDirectivesModule ,
168- CoreQuestionComponentsModule ,
169- CoreBlockComponentsModule ,
170- CoreEditorComponentsModule ,
171- CoreSearchComponentsModule ,
172153 ] ;
173154
174155 protected readonly LAZY_IMPORTS = [
175- getCoreStandaloneComponents ,
176- getCourseStandaloneComponents ,
177- getSitePluginsDirectives ,
156+ getBlockExportedDirectives ,
157+ getCoreDeprecatedComponents ,
158+ getCourseExportedDirectives ,
159+ getCoursesExportedDirectives ,
160+ getEditorExportedDirectives ,
161+ getQuestionExportedDirectives ,
162+ getRemindersExportedDirectives ,
163+ getSearchExportedDirectives ,
164+ getSitePluginsExportedDirectives ,
165+ getUsersExportedDirectives ,
178166 ] ;
179167
180168 protected componentId = 0 ;
@@ -408,6 +396,7 @@ export class CoreCompileProvider {
408396 getNotesServices ( ) ,
409397 getNotificationsServices ( ) ,
410398 getPrivateFilesServices ( ) ,
399+ getRemindersServices ( ) ,
411400 getSitePluginsServices ( ) ,
412401 ] ) ;
413402
0 commit comments