Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 290ea59

Browse files
committed
feat: update to rxjs@6.0.0-beta.1
1 parent 25c6a21 commit 290ea59

17 files changed

+314
-316
lines changed

package-lock.json

Lines changed: 91 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,20 @@
2828
},
2929
"homepage": "https://github.com/angular/in-memory-web-api#readme",
3030
"peerDependencies": {
31-
"@angular/common": ">=2.0.0 <6.0.0",
32-
"@angular/core": ">=2.0.0 <6.0.0",
33-
"@angular/http": ">=2.0.0 <6.0.0",
34-
"rxjs": "^5.1.0"
31+
"@angular/common": "^6.0.0-rc.0",
32+
"@angular/core": "^6.0.0-rc.0",
33+
"@angular/http": "^6.0.0-rc.0"
3534
},
3635
"devDependencies": {
37-
"@angular/animations": "~4.3.1",
38-
"@angular/common": "~4.3.1",
39-
"@angular/compiler": "~4.3.1",
40-
"@angular/compiler-cli": "~4.3.1",
41-
"@angular/core": "~4.3.1",
42-
"@angular/http": "~4.3.1",
43-
"@angular/platform-browser": "~4.3.1",
44-
"@angular/platform-browser-dynamic": "~4.3.1",
45-
"@angular/platform-server": "~4.3.1",
46-
"@angular/tsc-wrapped": "~4.3.1",
36+
"@angular/animations": "6.0.0-rc.0",
37+
"@angular/common": "6.0.0-rc.0",
38+
"@angular/compiler": "6.0.0-rc.0",
39+
"@angular/compiler-cli": "6.0.0-rc.0",
40+
"@angular/core": "6.0.0-rc.0",
41+
"@angular/http": "6.0.0-rc.0",
42+
"@angular/platform-browser": "6.0.0-rc.0",
43+
"@angular/platform-browser-dynamic": "6.0.0-rc.0",
44+
"@angular/platform-server": "6.0.0-rc.0",
4745
"@types/jasmine": "2.5.54",
4846
"@types/jasmine-ajax": "^3.1.37",
4947
"@types/node": "^6.0.46",
@@ -74,10 +72,10 @@
7472
"rimraf": "^2.6.1",
7573
"rollup": "^0.49.3",
7674
"rollup-stream": "^1.24.1",
77-
"rxjs": "^5.1.0",
75+
"rxjs": "^6.0.0-beta.1",
7876
"systemjs": "0.20.18",
7977
"tslint": "^3.15.1",
80-
"typescript": "~2.3.2",
78+
"typescript": "~2.7.2",
8179
"vinyl-source-stream": "^1.1.0",
8280
"webpack": "2.2.1",
8381
"yargs": "^5.0.0",

src/app/hero-in-mem-data-override.service.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
*/
44
import { Injectable } from '@angular/core';
55

6-
import { URLSearchParams } from '@angular/http';
7-
86
// tslint:disable-next-line:no-unused-variable
9-
import { Observable } from 'rxjs/Observable';
7+
import { Observable } from 'rxjs';
108

119
import { ParsedRequestUrl, RequestInfo, RequestInfoUtilities, ResponseOptions } from '../in-mem/interfaces';
1210

src/app/hero-in-mem-data.service.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import { Injectable } from '@angular/core';
1212
import { InMemoryDbService, RequestInfo } from '../in-mem/interfaces';
1313

1414
// tslint:disable:no-unused-variable
15-
import { Observable } from 'rxjs/Observable';
16-
import { of } from 'rxjs/observable/of';
17-
import 'rxjs/add/operator/delay';
15+
import { Observable, of } from 'rxjs';
16+
import { delay } from 'rxjs/operators';
1817
// tslint:enable:no-unused-variable
1918

2019
@Injectable()
@@ -58,7 +57,7 @@ export class HeroInMemDataService implements InMemoryDbService {
5857

5958
switch (returnType) {
6059
case ('observable'):
61-
return of(db).delay(10);
60+
return of(db).pipe(delay(10));
6261
case ('promise'):
6362
return new Promise(resolve => {
6463
setTimeout(() => resolve(db), 10);

0 commit comments

Comments
 (0)