diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0173a12cda..ed24ac8ec8 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,7 +1,6 @@ import { APP_BASE_HREF, CommonModule, DOCUMENT } from '@angular/common'; import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; -import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; +import { APP_ID, NgModule } from '@angular/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { EffectsModule } from '@ngrx/effects'; @@ -124,13 +123,13 @@ const PROVIDERS = [ AppComponent, ], imports: [ - BrowserModule.withServerTransition({appId: 'dspace-angular'}), ...IMPORTS, NgxMaskModule.forRoot(), ThemedRootComponent ], providers: [ ...PROVIDERS, + {provide: APP_ID, useValue: 'dspace-angular'}, provideCore(), ], bootstrap: [AppComponent] diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index 7a239dc8bc..fa6e3b5362 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -1,6 +1,6 @@ import { HttpClient, HttpClientModule } from '@angular/common/http'; -import { NgModule } from '@angular/core'; -import { BrowserModule, BrowserTransferStateModule, makeStateKey, TransferState } from '@angular/platform-browser'; +import { APP_ID, NgModule } from '@angular/core'; +import { makeStateKey, TransferState } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { REQUEST } from '@nguniversal/express-engine/tokens'; @@ -53,9 +53,6 @@ export function getRequest(transferState: TransferState): any { @NgModule({ bootstrap: [AppComponent], imports: [ - BrowserModule.withServerTransition({ - appId: 'dspace-angular' - }), HttpClientModule, // forRoot ensures the providers are only created once IdlePreloadModule.forRoot(), @@ -64,7 +61,6 @@ export function getRequest(transferState: TransferState): any { BrowserAnimationsModule, StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig), EffectsModule.forFeature(coreEffects), - BrowserTransferStateModule, TranslateModule.forRoot({ loader: { provide: TranslateLoader, @@ -76,6 +72,7 @@ export function getRequest(transferState: TransferState): any { ], providers: [ ...BrowserInitService.providers(), + {provide: APP_ID, useValue: 'dspace-angular'}, { provide: REQUEST, useFactory: getRequest, diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts index 4a54384c5a..2ced9328c6 100644 --- a/src/modules/app/server-app.module.ts +++ b/src/modules/app/server-app.module.ts @@ -1,16 +1,12 @@ import { HTTP_INTERCEPTORS } from '@angular/common/http'; -import { NgModule } from '@angular/core'; -import { BrowserModule, TransferState } from '@angular/platform-browser'; +import { APP_ID, NgModule } from '@angular/core'; +import { TransferState } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ServerModule, ServerTransferStateModule } from '@angular/platform-server'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { - Angulartics2, - Angulartics2GoogleAnalytics, - Angulartics2GoogleGlobalSiteTag -} from 'angulartics2'; +import { Angulartics2, Angulartics2GoogleAnalytics, Angulartics2GoogleGlobalSiteTag } from 'angulartics2'; import { AppComponent } from '../../app/app.component'; @@ -51,9 +47,6 @@ export function createTranslateLoader(transferState: TransferState) { @NgModule({ bootstrap: [AppComponent], imports: [ - BrowserModule.withServerTransition({ - appId: 'dspace-angular' - }), NoopAnimationsModule, ServerTransferStateModule, StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig), @@ -70,6 +63,7 @@ export function createTranslateLoader(transferState: TransferState) { ], providers: [ ...ServerInitService.providers(), + {provide: APP_ID, useValue: 'dspace-angular'}, { provide: Angulartics2, useClass: Angulartics2Mock