refactor(router-store): use environment providers instead of providers

ngrx · Aug 23, 2022 · 2ab35d4 · 2ab35d4
1 parent f862c45
commit 2ab35d4
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 40 deletions.
diff --git a/modules/router-store/src/init_router_store.ts b/modules/router-store/src/init_router_store.ts
diff --git a/modules/router-store/src/provide_router_store.ts b/modules/router-store/src/provide_router_store.ts
@@ -1,4 +1,4 @@
-import { Provider } from '@angular/core';
+import { ENVIRONMENT_INITIALIZER, inject, Provider } from '@angular/core';
 import {
   _createRouterConfig,
   _ROUTER_CONFIG,
@@ -15,7 +15,8 @@ import {
   BaseRouterStoreState,
   RouterStateSerializer,
 } from './serializers/base';
-import { _initRouterStore } from './init_router_store';
+import { StoreRouterConnectingService } from './store_router_connecting.service';
+import { EnvironmentProviders } from '@ngrx/store';
 
 /**
  * Provider function to connect the RouterModule to the StoreModule
@@ -32,22 +33,40 @@ import { _initRouterStore } from './init_router_store';
  */
 export function provideRouterStore<
   T extends BaseRouterStoreState = SerializedRouterStateSnapshot
->(config: StoreRouterConfig<T> = {}): Provider[] {
-  return [
-    { provide: _ROUTER_CONFIG, useValue: config },
-    {
-      provide: ROUTER_CONFIG,
-      useFactory: _createRouterConfig,
-      deps: [_ROUTER_CONFIG],
-    },
-    {
-      provide: RouterStateSerializer,
-      useClass: config.serializer
-        ? config.serializer
-        : config.routerState === RouterState.Full
-        ? FullRouterStateSerializer
-        : MinimalRouterStateSerializer,
-    },
-    _initRouterStore,
-  ];
+>(config: StoreRouterConfig<T> = {}): EnvironmentProviders {
+  return {
+    ɵproviders: [
+      { provide: _ROUTER_CONFIG, useValue: config },
+      {
+        provide: ROUTER_CONFIG,
+        useFactory: _createRouterConfig,
+        deps: [_ROUTER_CONFIG],
+      },
+      {
+        provide: RouterStateSerializer,
+        useClass: config.serializer
+          ? config.serializer
+          : config.routerState === RouterState.Full
+          ? FullRouterStateSerializer
+          : MinimalRouterStateSerializer,
+      },
+      {
+        provide: ENVIRONMENT_INITIALIZER,
+        multi: true,
+        useFactory() {
+          return () => inject(StoreRouterConnectingService);
+        },
+      },
+      {
+        provide: ENVIRONMENT_INITIALIZER,
+        multi: true,
+        useFactory() {
+          return () => {
+            inject(StoreRouterConnectingService);
+          };
+        },
+      },
+      StoreRouterConnectingService,
+    ],
+  };
 }
diff --git a/modules/router-store/src/router_store_module.ts b/modules/router-store/src/router_store_module.ts
@@ -55,7 +55,7 @@ export class StoreRouterConnectingModule {
   ): ModuleWithProviders<StoreRouterConnectingModule> {
     return {
       ngModule: StoreRouterConnectingModule,
-      providers: provideRouterStore(config),
+      providers: [...provideRouterStore(config).ɵproviders],
     };
   }
 }