Merge branch 'rxjs'

AlexKhymenko · Feb 26, 2018 · 6efaf2d · 6efaf2d
2 parents fbeb348 + 16bba90
commit 6efaf2d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.0.0
+BREAKING CHANGE 
+MINIMAL rxjs dependency is 5.5 
+
 ## 3.2.3
 Optimise directive when working with lot of data(prevent re rendering);
 

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ You can test library in [Plunker](https://plnkr.co/edit/n6Wa6hXg0JzI6e050wBt?p=p
 - [Development](#development)
 - [License](#license)
 
-### Migration from version 0.1 to 1.0 [CHANGELOG](CHANGELOG.md)
+### With version 4 minimal rxjs dependency 5.5
 ### Version 2 for angular 4/5. Version 1 for angular 2/4
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-permissions",
-  "version": "3.2.4",
+  "version": "4.0.0",
   "scripts": {
     "build": "gulp build",
     "build:watch": "gulp",

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-permissions",
-  "version": "3.2.4",
+  "version": "4.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/AlexKhymenko/ngx-permissions"

diff --git a/src/service/permissions.service.ts b/src/service/permissions.service.ts
@@ -11,6 +11,9 @@ import 'rxjs/add/operator/toPromise';
 import 'rxjs/add/operator/mergeAll';
 import 'rxjs/add/observable/merge';
 import 'rxjs/add/observable/from';
+
+import { merge } from 'rxjs/observable/merge';
+
 import { isFunction, transformStringToArray } from '../utils/utils';
 
 
@@ -126,7 +129,7 @@ export class NgxPermissionsService {
             }
 
         });
-        return Observable.merge(promises)
+        return merge(promises)
                          .mergeAll()
                          .first((data: any) => {
                              return data !== false;

diff --git a/src/service/roles.service.ts b/src/service/roles.service.ts
@@ -7,9 +7,10 @@ import 'rxjs/add/operator/first';
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/operator/toPromise';
 import 'rxjs/add/operator/mergeAll';
-import 'rxjs/add/observable/merge';
 import 'rxjs/add/observable/from';
 import 'rxjs/add/operator/every';
+import { merge } from 'rxjs/observable/merge';
+
 import { Inject, Injectable, InjectionToken } from '@angular/core';
 import { NgxRolesStore } from '../store/roles.store';
 import { isFunction, isPromise, transformStringToArray } from '../utils/utils';
@@ -91,7 +92,7 @@ export class NgxRolesService {
             promises.push(Observable.of(false));
         });
 
-        return Observable.merge(promises).mergeAll().first((data: any) => {
+        return merge(promises).mergeAll().first((data: any) => {
             return data !== false;
         }, () => true, false).toPromise().then((data: any) => {
             return data;