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

Commit 63fd45e

Browse files
committed
feat: update to rxjs@6.0.0-beta.1
1 parent 3ce887f commit 63fd45e

18 files changed

+339
-344
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",

rollup.config.js

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1+
const globals = {
2+
'@angular/core': 'ng.core',
3+
'@angular/http': 'ng.http',
4+
'@angular/common/http': 'ng.common.http',
5+
'rxjs': 'rxjs',
6+
'rxjs/operators': 'rxjs.operators'
7+
};
8+
19
export default {
210
input: './src/in-mem/index.js',
3-
// output: { ... does not work! Why?
4-
file: './bundles/in-memory-web-api.umd.js',
5-
format: 'umd',
6-
name: 'ng.inMemoryWebApi',
7-
sourcemap: true,
8-
globals: {
9-
'@angular/core': 'ng.core',
10-
'@angular/http': 'ng.http',
11-
'@angular/common/http': 'ng.common.http',
12-
'rxjs/BehaviorSubject': 'Rx',
13-
'rxjs/Observable': 'Rx',
14-
'rxjs/add/operator/delay': 'Rx',
15-
'rxjs/observable/of': 'Rx',
16-
'rxjs/observable/fromPromise': 'Rx',
17-
'rxjs/util/isPromise': 'Rx',
18-
'rxjs/operator/concatMap': 'Rx',
19-
'rxjs/operator/delay': 'Rx',
20-
'rxjs/operator/filter': 'Rx',
21-
'rxjs/operator/first': 'Rx',
22-
'rxjs/operator/map': 'Rx'
23-
}
24-
// }
11+
file: './bundles/in-memory-web-api.umd.js',
12+
format: 'umd',
13+
name: 'ng.inMemoryWebApi',
14+
sourcemap: true,
15+
globals,
16+
external: Object.keys(globals)
2517
}

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

0 commit comments

Comments
 (0)