Skip to content

Commit b694795

Browse files
clydinhansl
clydin
authored and
hansl
committed
refactor: update to rxjs 6.0.0-beta.3
1 parent bcb23e4 commit b694795

80 files changed

Lines changed: 302 additions & 322 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"raw-loader": "^0.5.1",
134134
"request": "^2.83.0",
135135
"resolve": "^1.5.0",
136-
"rxjs": "^5.5.8",
136+
"rxjs": "^6.0.0-beta.3",
137137
"sass-loader": "^6.0.7",
138138
"semver": "^5.3.0",
139139
"semver-intersect": "^1.1.2",

‎packages/angular_devkit/architect/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"preinstall": "echo DO NOT INSTALL THIS PROJECT, ONLY THE ROOT PROJECT. && exit 1"
99
},
1010
"dependencies": {
11-
"rxjs": "^5.5.8"
11+
"rxjs": "^6.0.0-beta.3"
1212
},
1313
"peerDependencies": {
1414
"@angular-devkit/core": "0.0.0"

‎packages/angular_devkit/architect/src/architect.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ import {
2121
virtualFs,
2222
} from '@angular-devkit/core';
2323
import { resolve as nodeResolve } from '@angular-devkit/core/node';
24-
import { Observable } from 'rxjs/Observable';
25-
import { forkJoin } from 'rxjs/observable/forkJoin';
26-
import { of } from 'rxjs/observable/of';
27-
import { _throw } from 'rxjs/observable/throw';
24+
import { Observable, forkJoin, of, throwError } from 'rxjs';
2825
import { concatMap, map, tap } from 'rxjs/operators';
2926
import {
3027
BuildEvent,
@@ -248,7 +245,7 @@ export class Architect {
248245
concatMap((pkgJson: JsonObject) => {
249246
const pkgJsonBuildersentry = pkgJson['builders'] as string;
250247
if (!pkgJsonBuildersentry) {
251-
return _throw(new BuilderCannotBeResolvedException(builderConfig.builder));
248+
return throwError(new BuilderCannotBeResolvedException(builderConfig.builder));
252249
}
253250

254251
buildersJsonPath = join(dirname(normalize(pkgJsonPath)), pkgJsonBuildersentry);
@@ -262,7 +259,7 @@ export class Architect {
262259
builderPaths = builderPathsMap.builders[builderName];
263260

264261
if (!builderPaths) {
265-
return _throw(new BuilderCannotBeResolvedException(builderConfig.builder));
262+
return throwError(new BuilderCannotBeResolvedException(builderConfig.builder));
266263
}
267264

268265
// Resolve paths in the builder paths.

‎packages/angular_devkit/architect/src/builder.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import { JsonObject, Path, experimental, logging, virtualFs } from '@angular-devkit/core';
10-
import { Observable } from 'rxjs/Observable';
10+
import { Observable } from 'rxjs';
1111
import { Architect, BuilderConfiguration } from './architect';
1212

1313

‎packages/angular_devkit/architect/test/browser/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import { Observable } from 'rxjs/Observable';
9+
import { Observable } from 'rxjs';
1010
import { BuildEvent, Builder, BuilderConfiguration } from '../../src';
1111

1212

‎packages/angular_devkit/architect/test/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"builders": "builders.json",
33
"dependencies": {
4-
"rxjs": "^5.5.8"
4+
"rxjs": "^6.0.0-beta.3"
55
}
66
}

‎packages/angular_devkit/architect_cli/bin/architect.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
1313
import { existsSync, readFileSync } from 'fs';
1414
import * as minimist from 'minimist';
1515
import * as path from 'path';
16-
import { _throw } from 'rxjs/observable/throw';
16+
import { throwError } from 'rxjs';
1717
import { concatMap } from 'rxjs/operators';
1818

1919

@@ -124,7 +124,7 @@ workspace.loadWorkspaceFromJson(workspaceJson).pipe(
124124
// TODO: better logging of what's happening.
125125
if (argv.help) {
126126
// TODO: add target help
127-
return _throw('Target help NYI.');
127+
return throwError('Target help NYI.');
128128
// architect.help(targetOptions, logger);
129129
} else {
130130
const builderConfig = architect.getBuilderConfiguration(targetSpec);

‎packages/angular_devkit/architect_cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
"@angular-devkit/core": "0.0.0",
1919
"@angular-devkit/architect": "0.0.0",
2020
"minimist": "^1.2.0",
21-
"rxjs": "^5.5.8"
21+
"rxjs": "^6.0.0-beta.3"
2222
}
2323
}

‎packages/angular_devkit/build_angular/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"raw-loader": "^0.5.1",
4444
"request": "^2.83.0",
4545
"resolve": "^1.5.0",
46-
"rxjs": "^5.5.8",
46+
"rxjs": "^6.0.0-beta.3",
4747
"sass-loader": "^6.0.7",
4848
"silent-error": "^1.1.0",
4949
"source-map-support": "^0.5.0",

‎packages/angular_devkit/build_angular/src/angular-cli-files/utilities/check-port.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import { Observable } from 'rxjs/Observable';
9+
import { Observable } from 'rxjs';
1010
const portfinder = require('portfinder');
1111

1212

0 commit comments

Comments
 (0)