diff --git a/package.json b/package.json index cb4143737ec0..7f22547d577a 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "pacote": "^9.2.3", "pidtree": "^0.3.0", "pidusage": "^2.0.17", - "rxjs": "~6.4.0", + "rxjs": "6.5.3", "sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz", "semver": "6.3.0", "source-map": "^0.7.3", diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json index 12bad056e733..4b9e41995d5a 100644 --- a/packages/angular_devkit/architect/package.json +++ b/packages/angular_devkit/architect/package.json @@ -7,7 +7,7 @@ "typings": "src/index.d.ts", "dependencies": { "@angular-devkit/core": "0.0.0", - "rxjs": "6.4.0" + "rxjs": "6.5.3" }, "builders": "./builders/builders.json" } diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json index 82224c697d6b..57810f0bac01 100644 --- a/packages/angular_devkit/architect_cli/package.json +++ b/packages/angular_devkit/architect_cli/package.json @@ -17,7 +17,7 @@ "@angular-devkit/core": "0.0.0", "minimist": "1.2.0", "progress": "2.0.3", - "rxjs": "6.4.0", + "rxjs": "6.5.3", "symbol-observable": "1.2.0" }, "devDependencies": { diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json index 9d9b0bb12a0e..59a2b6526ff2 100644 --- a/packages/angular_devkit/benchmark/package.json +++ b/packages/angular_devkit/benchmark/package.json @@ -18,7 +18,7 @@ "minimist": "1.2.0", "pidusage": "2.0.17", "pidtree": "0.3.0", - "rxjs": "6.4.0", + "rxjs": "6.5.3", "tree-kill": "^1.2.0" } } \ No newline at end of file diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index db5b6124c3b3..ebcf423507d8 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -41,7 +41,7 @@ "postcss-loader": "3.0.0", "raw-loader": "3.1.0", "regenerator-runtime": "0.13.3", - "rxjs": "6.4.0", + "rxjs": "6.5.3", "sass": "1.22.12", "sass-loader": "8.0.0", "semver": "6.3.0", diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts index 84abd3852729..6b915da053d6 100644 --- a/packages/angular_devkit/build_angular/src/browser/index.ts +++ b/packages/angular_devkit/build_angular/src/browser/index.ts @@ -27,9 +27,8 @@ import { NodeJsSyncHost } from '@angular-devkit/core/node'; import { createHash } from 'crypto'; import * as findCacheDirectory from 'find-cache-dir'; import * as fs from 'fs'; -import * as os from 'os'; import * as path from 'path'; -import { from, of } from 'rxjs'; +import { Observable, from, of } from 'rxjs'; import { bufferCount, catchError, concatMap, map, mergeScan, switchMap } from 'rxjs/operators'; import { ScriptTarget } from 'typescript'; import * as webpack from 'webpack'; @@ -192,7 +191,7 @@ export function buildWebpackBrowser( logging?: WebpackLoggingCallback; indexHtml?: IndexHtmlTransform; } = {}, -) { +): Observable { const host = new NodeJsSyncHost(); const root = normalize(context.workspaceRoot); diff --git a/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts b/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts index 30682efc6e99..b4234cd269f6 100644 --- a/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts +++ b/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts @@ -6,13 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ import { Path, resolve, virtualFs } from '@angular-devkit/core'; -import { EMPTY } from 'rxjs'; -import { concatMap, last } from 'rxjs/operators'; +import { EMPTY, Observable } from 'rxjs'; +import { concatMap, last, map } from 'rxjs/operators'; /** * Delete an output directory, but error out if it's the root of the project. */ -export function deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host) { +export function deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host): Observable { const resolvedOutputPath = resolve(root, outputPath); if (resolvedOutputPath === root) { throw new Error('Output path MUST not be project root directory!'); @@ -21,5 +21,6 @@ export function deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Ho return host.exists(resolvedOutputPath).pipe( concatMap(exists => exists ? host.delete(resolvedOutputPath) : EMPTY), last(null, null), + map(() => undefined), ); } diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json index a8bc263ab8c6..4d6244bba1a9 100644 --- a/packages/angular_devkit/build_ng_packagr/package.json +++ b/packages/angular_devkit/build_ng_packagr/package.json @@ -8,7 +8,7 @@ "builders": "builders.json", "dependencies": { "@angular-devkit/architect": "0.0.0", - "rxjs": "6.4.0" + "rxjs": "6.5.3" }, "peerDependencies": { "ng-packagr": "^4.0.0 || ^5.0.0" diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json index 01e83eeeeaec..3b3455909873 100644 --- a/packages/angular_devkit/build_webpack/package.json +++ b/packages/angular_devkit/build_webpack/package.json @@ -9,7 +9,7 @@ "dependencies": { "@angular-devkit/architect": "0.0.0", "@angular-devkit/core": "0.0.0", - "rxjs": "6.4.0", + "rxjs": "6.5.3", "webpack-merge": "4.2.2" }, "peerDependencies": { diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json index 45ecc3089b10..17c797fd7482 100644 --- a/packages/angular_devkit/core/package.json +++ b/packages/angular_devkit/core/package.json @@ -11,7 +11,7 @@ "ajv": "6.10.2", "fast-json-stable-stringify": "2.0.0", "magic-string": "0.25.3", - "rxjs": "6.4.0", + "rxjs": "6.5.3", "source-map": "0.7.3" }, "devDependencies": { diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json index ba3351542cde..50b161e7f9f0 100644 --- a/packages/angular_devkit/schematics/package.json +++ b/packages/angular_devkit/schematics/package.json @@ -14,6 +14,6 @@ ], "dependencies": { "@angular-devkit/core": "0.0.0", - "rxjs": "6.4.0" + "rxjs": "6.5.3" } } diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json index a2ba312bf0fc..99c7c16790eb 100644 --- a/packages/angular_devkit/schematics_cli/package.json +++ b/packages/angular_devkit/schematics_cli/package.json @@ -20,7 +20,7 @@ "@schematics/schematics": "0.0.0", "inquirer": "7.0.0", "minimist": "1.2.0", - "rxjs": "6.4.0", + "rxjs": "6.5.3", "symbol-observable": "1.2.0" } } diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index 3c2726007ec6..002c8e62da81 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -23,7 +23,7 @@ "dependencies": { "@angular-devkit/core": "0.0.0", "enhanced-resolve": "4.1.0", - "rxjs": "6.4.0", + "rxjs": "6.5.3", "tree-kill": "1.2.1", "webpack-sources": "1.4.3" }, diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts index c80145439ccc..dbe33af42323 100644 --- a/packages/schematics/angular/utility/latest-versions.ts +++ b/packages/schematics/angular/utility/latest-versions.ts @@ -9,7 +9,7 @@ export const latestVersions = { // These versions should be kept up to date with latest Angular peer dependencies. Angular: '~9.0.0-next.7', - RxJs: '~6.4.0', + RxJs: '~6.5.3', ZoneJs: '~0.10.2', TypeScript: '~3.5.3', TsLib: '^1.10.0', diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json index 0cf9ac252c38..6cb4128f105b 100644 --- a/packages/schematics/update/package.json +++ b/packages/schematics/update/package.json @@ -18,6 +18,6 @@ "pacote": "9.5.8", "semver": "6.3.0", "semver-intersect": "1.4.0", - "rxjs": "6.4.0" + "rxjs": "6.5.3" } } diff --git a/yarn.lock b/yarn.lock index c6a7ecc72b94..487361f28a4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8778,14 +8778,7 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@6.4.0, rxjs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" - integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== - dependencies: - tslib "^1.9.0" - -rxjs@^6.0.0, rxjs@^6.4.0: +rxjs@6.5.3, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==