diff --git a/aio/tools/ng-packages-installer/index.js b/aio/tools/ng-packages-installer/index.js index d8b6fd0670..93b0efe13d 100644 --- a/aio/tools/ng-packages-installer/index.js +++ b/aio/tools/ng-packages-installer/index.js @@ -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]; diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json index 0b3895b7a2..cde9303ed9 100644 --- a/integration/_payload-limits.json +++ b/integration/_payload-limits.json @@ -3,8 +3,8 @@ "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 } } @@ -12,8 +12,8 @@ "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 } } }, diff --git a/package.json b/package.json index 5c78fb67bf..3ed10107c9 100644 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/packages/core/package.json b/packages/core/package.json index f8850a5412..ea64cdb77a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -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": { diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json index 5f8a59d9e4..a8565e07c5 100644 --- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json +++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json @@ -95,6 +95,9 @@ { "name": "__extends$20" }, + { + "name": "_enable_super_gross_mode_that_will_cause_bad_things" + }, { "name": "_renderCompCount" }, @@ -179,6 +182,9 @@ { "name": "hostElement" }, + { + "name": "hostReportError" + }, { "name": "initChangeDetectorIfExisting" }, diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json index cec5fad462..43bca0bd43 100644 --- a/packages/core/test/bundling/injection/bundle.golden_symbols.json +++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json @@ -137,6 +137,9 @@ { "name": "_currentInjector" }, + { + "name": "_enable_super_gross_mode_that_will_cause_bad_things" + }, { "name": "config" }, @@ -185,6 +188,9 @@ { "name": "hasOnDestroy" }, + { + "name": "hostReportError" + }, { "name": "inject" }, diff --git a/yarn.lock b/yarn.lock index 6eb3101205..bf1f30cb6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"