Skip to content

Commit

Permalink
build: update to rxjs@6.0.0-beta.0 (angular#22887)
Browse files Browse the repository at this point in the history
PR Close angular#22887
  • Loading branch information
IgorMinar authored and leo6104 committed Mar 25, 2018
1 parent 07ee3aa commit a79a730
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 9 deletions.
1 change: 1 addition & 0 deletions aio/tools/ng-packages-installer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ class NgPackagesInstaller {
// FIXME: Temporarily use RxJS from root `node_modules/`.
if (peerDependencies.rxjs) {
peerDependencies.rxjs = `file:${ANGULAR_ROOT_DIR}/node_modules/rxjs`;
peerDependencies['rxjs-compat'] = '6.0.0-beta.0';
}

return [mergedDependencies, peerDependencies];
Expand Down
8 changes: 4 additions & 4 deletions integration/_payload-limits.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"master": {
"uncompressed": {
"inline": 1508,
"main": "TODO(i): temporarily increase the payload size limit to 352346 from 155112, we need CLI v6 to bring the size down",
"main": 251064,
"main": "TODO(i): temporarily increase the payload size limit to 257298 from 155112, we need CLI v6 to bring the size down",
"main": 257298,
"polyfills": 59483
}
}
},
"hello_world__closure": {
"master": {
"uncompressed": {
"bundle": "TODO(i): temporarily increase the payload size limit to 221852 from 105779 - we need CLI v6 to bring the size down",
"bundle": 221852
"bundle": "TODO(i): temporarily increase the payload size limit to 226340git from 105779 - we need CLI v6 to bring the size down",
"bundle": 226340
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"core-js": "^2.4.1",
"reflect-metadata": "^0.1.3",
"rxjs": "6.0.0-alpha.4",
"rxjs": "6.0.0-beta.0",
"tslib": "^1.7.1",
"zone.js": "^0.8.12"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"tslib": "^1.9.0"
},
"peerDependencies": {
"rxjs": "^6.0.0-alpha.3",
"rxjs": "^5.6.0-forward-compat.0 || ^6.0.0-beta.0",
"zone.js": "^0.8.4"
},
"repository": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@
{
"name": "__extends$20"
},
{
"name": "_enable_super_gross_mode_that_will_cause_bad_things"
},
{
"name": "_renderCompCount"
},
Expand Down Expand Up @@ -179,6 +182,9 @@
{
"name": "hostElement"
},
{
"name": "hostReportError"
},
{
"name": "initChangeDetectorIfExisting"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@
{
"name": "_currentInjector"
},
{
"name": "_enable_super_gross_mode_that_will_cause_bad_things"
},
{
"name": "config"
},
Expand Down Expand Up @@ -185,6 +188,9 @@
{
"name": "hasOnDestroy"
},
{
"name": "hostReportError"
},
{
"name": "inject"
},
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6214,9 +6214,9 @@ rx-lite@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"

rxjs@6.0.0-alpha.4:
version "6.0.0-alpha.4"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-alpha.4.tgz#e24afa7457d95a981f081d2979c3ba69b20c8ca3"
rxjs@6.0.0-beta.0:
version "6.0.0-beta.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-beta.0.tgz#cf241936be39d8279ed0b2be4bf417777301f65a"
dependencies:
tslib "^1.9.0"

Expand Down

0 comments on commit a79a730

Please sign in to comment.