fix(Effects): Ensure StoreModule is loaded before effects (#230)

Closes #184, #219
ngrx · Aug 3, 2017 · 065d33e · 065d33e
1 parent f969676
commit 065d33e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/modules/effects/src/effects_feature_module.ts b/modules/effects/src/effects_feature_module.ts
@@ -1,12 +1,14 @@
-import { NgModule, Inject, Type } from '@angular/core';
+import { NgModule, Inject, Optional } from '@angular/core';
+import { StoreModule } from '@ngrx/store';
 import { EffectsRootModule } from './effects_root_module';
 import { FEATURE_EFFECTS } from './tokens';
 
 @NgModule({})
 export class EffectsFeatureModule {
   constructor(
     private root: EffectsRootModule,
-    @Inject(FEATURE_EFFECTS) effectSourceGroups: any[][]
+    @Inject(FEATURE_EFFECTS) effectSourceGroups: any[][],
+    @Optional() storeModule: StoreModule
   ) {
     effectSourceGroups.forEach(group =>
       group.forEach(effectSourceInstance =>

diff --git a/modules/effects/src/effects_root_module.ts b/modules/effects/src/effects_root_module.ts
@@ -1,4 +1,5 @@
-import { NgModule, Inject } from '@angular/core';
+import { NgModule, Inject, Optional } from '@angular/core';
+import { StoreModule } from '@ngrx/store';
 import { EffectsRunner } from './effects_runner';
 import { EffectSources } from './effect_sources';
 import { ROOT_EFFECTS } from './tokens';
@@ -8,7 +9,8 @@ export class EffectsRootModule {
   constructor(
     private sources: EffectSources,
     runner: EffectsRunner,
-    @Inject(ROOT_EFFECTS) rootEffects: any[]
+    @Inject(ROOT_EFFECTS) rootEffects: any[],
+    @Optional() storeModule: StoreModule
   ) {
     runner.start();