Skip to content

Commit

Permalink
[cascading] from release/12.0.0-rc to main (#2788)
Browse files Browse the repository at this point in the history
<!--
{"currentBranch":"release/12.0.0-rc","targetBranch":"main","bypassReviewers":false,"isConflicting":false}
-->

## Cascading from release/12.0.0-rc to main

---

<small>This Pull Request has been generated with ❤️ by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
fpaul-1A authored Feb 3, 2025
2 parents e6b24a3 + e2610ad commit e51aff0
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions packages/@o3r/routing/src/tools/app-server-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import {
ModuleWithProviders,
NgModule,
} from '@angular/core';
import type {
BuildTimeProperties,
import {
type BuildTimeProperties,
DEFAULT_BUILD_PROPERTIES,
} from '@o3r/core';

/**
Expand Down Expand Up @@ -38,11 +39,11 @@ export class AppServerRoutingModule {
* Injects the APP_BASE_HREF with a custom factory
* @param config The application environment configuration
*/
public static forRoot(config: BuildTimeProperties): ModuleWithProviders<AppServerRoutingModule> {
public static forRoot(config: Partial<BuildTimeProperties>): ModuleWithProviders<AppServerRoutingModule> {
return {
ngModule: AppServerRoutingModule,
providers: [
{ provide: ENVIRONMENT_CONFIG_TOKEN, useValue: config },
{ provide: ENVIRONMENT_CONFIG_TOKEN, useValue: { ...DEFAULT_BUILD_PROPERTIES, ...config } },
{
provide: APP_BASE_HREF,
useFactory: appBaseHrefFactory,
Expand Down

0 comments on commit e51aff0

Please sign in to comment.