Merge pull request #174 from valor-software/develop

fix(*): import rxjs in a proper way. Closes #172 (#173)

Author: Georgii Rychko

e2e/app.e2e-spec.ts

@@ -37,6 +37,6 @@ describe('Tree App', () => {
         return antiquaNode.getAttribute(key).then((value: string) => expect(value).toEqual(attrs[key]));
     });
 
-    return Promise.all(expectations);
+    return Promise.all(expectations as any);
   });
 });

e2e/tslint.json

@@ -0,0 +1,6 @@
+{
+  "extends": ["../tslint.json"],
+  "rules": {
+    "rxjs-add": { "severity": "off" }
+  }
+}

package.json

@@ -85,6 +85,7 @@
     "protractor": "5.2.0",
     "rimraf": "2.6.2",
     "rxjs": "5.5.2",
+    "rxjs-tslint-rules": "3.1.2",
     "shelljs": "0.7.8",
     "systemjs-builder": "0.16.12",
     "ts-node": "3.3.0",

src/draggable/node-draggable.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, ElementRef } from '@angular/core';
-import { Subject } from 'rxjs/Rx';
+import { Subject } from 'rxjs/Subject';
 import { CapturedNode } from './captured-node';
 import { NodeDraggableEvent } from './draggable.events';
 

src/menu/node-menu.service.ts

@@ -1,5 +1,6 @@
 import { Injectable, ElementRef } from '@angular/core';
-import { Subject, Observable } from 'rxjs/Rx';
+import { Subject } from 'rxjs/Subject';
+import { Observable } from 'rxjs/Observable';
 import { NodeMenuEvent, NodeMenuAction } from './menu.events';
 
 @Injectable()

src/rxjs-imports.ts

@@ -0,0 +1,3 @@
+import 'rxjs/add/operator/filter';
+import 'rxjs/add/observable/of';
+

src/tree.module.ts

@@ -1,3 +1,5 @@
+import './rxjs-imports';
+
 import { NgModule } from '@angular/core';
 import { TreeComponent } from './tree.component';
 import { TreeInternalComponent } from './tree-internal.component';

src/tree.service.ts

@@ -12,7 +12,8 @@ import {
 import { RenamableNode } from './tree.types';
 import { Tree } from './tree';
 import { TreeController } from './tree-controller';
-import { Observable, Subject } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import { Subject } from 'rxjs/Subject';
 import { ElementRef, Inject, Injectable } from '@angular/core';
 import { NodeDraggableService } from './draggable/node-draggable.service';
 import { NodeDraggableEvent } from './draggable/draggable.events';

src/tree.ts

@@ -12,7 +12,8 @@ import {
   defaultsDeep
 } from './utils/fn.utils';
 
-import { Observable, Observer } from 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
 import { TreeModel, RenamableNode, FoldingType, TreeStatus, TreeModelSettings, ChildrenLoadingFunction } from './tree.types';
 import { NodeMenuItem } from './menu/node-menu.component';
 

test/draggable/node-draggable.service.spec.ts

@@ -1,5 +1,5 @@
 import { inject, TestBed } from '@angular/core/testing';
-import { Subject } from 'rxjs/Rx';
+import { Subject } from 'rxjs/Subject';
 import { NodeDraggableService } from '../../src/draggable/node-draggable.service';
 import { CapturedNode } from '../../src/draggable/captured-node';
 import { ElementRef } from '@angular/core';