Skip to content

Commit

Permalink
Update rxjs dependency and adjust rollup
Browse files Browse the repository at this point in the history
  • Loading branch information
jfcere committed Dec 10, 2017
1 parent c9a073e commit 83ade9f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"@angular/core": "^2.4.0 || ^4.0.0 || ^5.0.0",
"@angular/http": "^2.4.0 || ^4.0.0 || ^5.0.0",
"core-js": "^2.4.1",
"rxjs": "^5.1.0",
"rxjs": "^5.2.0",
"zone.js": "^0.7.6 || ^0.8.4"
}
}
4 changes: 3 additions & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export default {
'@angular/http': 'ng.http',
'marked': 'marked',
'prismjs': 'prismjs',
'rxjs/Observable': 'Rx',
'rxjs/Observable': 'rx.observable',
'rxjs/observable/ErrorObservable': 'rx.errorObservable',
},
external: [
'@angular/core',
Expand All @@ -33,6 +34,7 @@ export default {
'prismjs/components/prism-scss',
'prismjs/components/prism-typescript',
'rxjs/Observable',
'rxjs/observable/ErrorObservable',
'rxjs/add/operator/catch',
'rxjs/add/operator/map',
],
Expand Down
1 change: 1 addition & 0 deletions src/app/markdown/markdown.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Injectable } from '@angular/core';
import { Http, Response } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import { ErrorObservable } from 'rxjs/observable/ErrorObservable';

import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/map';
Expand Down

0 comments on commit 83ade9f

Please sign in to comment.