Skip to content

Commit 8095268

Browse files
alan-agius4angular-robot[bot]
alan-agius4
authored and
angular-robot[bot]
committed
build: update to rxjs 7
G3 is now using RXJS version 7 which makes it possible for the CLI to also be updated to RXJS 7. NB: this change does not remove all usages of the deprecated APIs. Closes #24371
1 parent 3cbeee7 commit 8095268

File tree

113 files changed

+500
-417
lines changed

Some content is hidden

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

113 files changed

+500
-417
lines changed

‎bin/devkit-admin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let logger = null;
3535
try {
3636
logger = new (require('@angular-devkit/core').logging.IndentLogger)('root');
3737
const colors = require('ansi-colors').create();
38-
const filter = require('rxjs/operators').filter;
38+
const filter = require('rxjs').filter;
3939

4040
logger
4141
.pipe(filter(entry => (entry.level !== 'debug' || args.verbose)))

‎goldens/public-api/angular_devkit/architect/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { JsonObject } from '@angular-devkit/core';
1010
import { JsonValue } from '@angular-devkit/core';
1111
import { logging } from '@angular-devkit/core';
1212
import { Observable } from 'rxjs';
13+
import { ObservableInput } from 'rxjs';
1314
import { Observer } from 'rxjs';
1415
import { schema } from '@angular-devkit/core';
15-
import { SubscribableOrPromise } from 'rxjs';
1616

1717
// @public (undocumented)
1818
export class Architect {
@@ -67,7 +67,7 @@ export type BuilderInput = json.JsonObject & Schema;
6767
export type BuilderOutput = json.JsonObject & Schema_2;
6868

6969
// @public
70-
export type BuilderOutputLike = AsyncIterable<BuilderOutput> | SubscribableOrPromise<BuilderOutput> | BuilderOutput;
70+
export type BuilderOutputLike = ObservableInput<BuilderOutput> | BuilderOutput;
7171

7272
// @public (undocumented)
7373
export type BuilderProgress = json.JsonObject & Schema_3 & TypedBuilderProgress;
@@ -97,6 +97,7 @@ export type BuilderRegistry = Registry<json.JsonObject, BuilderInput, BuilderOut
9797
export interface BuilderRun {
9898
id: number;
9999
info: BuilderInfo;
100+
lastOutput: Promise<BuilderOutput>;
100101
output: Observable<BuilderOutput>;
101102
progress: Observable<BuilderProgressReport>;
102103
result: Promise<BuilderOutput>;

‎goldens/public-api/angular_devkit/core/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import { ErrorObject } from 'ajv';
88
import { Format } from 'ajv';
99
import { Observable } from 'rxjs';
10+
import { ObservableInput } from 'rxjs';
1011
import { Operator } from 'rxjs';
1112
import { PartialObserver } from 'rxjs';
1213
import { Position } from 'source-map';
1314
import { Subject } from 'rxjs';
14-
import { SubscribableOrPromise } from 'rxjs';
1515
import { Subscription } from 'rxjs';
1616
import { ValidateFunction } from 'ajv';
1717

@@ -714,7 +714,7 @@ interface PromptDefinition {
714714
}
715715

716716
// @public (undocumented)
717-
type PromptProvider = (definitions: Array<PromptDefinition>) => SubscribableOrPromise<{
717+
type PromptProvider = (definitions: Array<PromptDefinition>) => ObservableInput<{
718718
[id: string]: JsonValue;
719719
}>;
720720

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
"puppeteer": "18.2.1",
194194
"quicktype-core": "22.0.0",
195195
"resolve-url-loader": "5.0.0",
196-
"rxjs": "6.6.7",
196+
"rxjs": "7.8.0",
197197
"sass": "1.58.1",
198198
"sass-loader": "13.2.0",
199199
"sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.8.1-linux.tar.gz",

‎packages/angular/cli/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ ts_library(
142142
"//packages/angular_devkit/schematics",
143143
"//packages/angular_devkit/schematics/testing",
144144
"@npm//@types/semver",
145-
"@npm//rxjs",
146145
],
147146
)
148147

‎packages/angular/cli/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
"symbol-observable": "4.0.0",
4242
"yargs": "17.6.2"
4343
},
44-
"devDependencies": {
45-
"rxjs": "6.6.7"
46-
},
4744
"ng-update": {
4845
"migrations": "@schematics/angular/migrations/migration-collection.json",
4946
"packageGroup": {

‎packages/angular/cli/src/command-builder/architect-base-command-module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ export abstract class ArchitectBaseCommandModule<T extends object>
8585
}
8686

8787
try {
88-
const { error, success } = await run.output.toPromise();
89-
88+
const { error, success } = await run.lastOutput;
9089
if (error) {
9190
logger.error(error);
9291
}

‎packages/angular_devkit/architect/builders/all-of.ts

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

99
import { json } from '@angular-devkit/core';
10-
import { EMPTY, from, of } from 'rxjs';
11-
import { map, mergeMap } from 'rxjs/operators';
10+
import { EMPTY, from, map, mergeMap, of } from 'rxjs';
1211
import { BuilderOutput, BuilderRun, createBuilder } from '../src';
1312
import { Schema as OperatorSchema } from './operator-schema';
1413

‎packages/angular_devkit/architect/builders/concat.ts

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

99
import { json } from '@angular-devkit/core';
10-
import { from, of } from 'rxjs';
11-
import { concatMap, first, last, map, switchMap } from 'rxjs/operators';
10+
import { concatMap, first, from, last, map, of, switchMap } from 'rxjs';
1211
import { BuilderOutput, BuilderRun, createBuilder } from '../src';
1312
import { Schema as OperatorSchema } from './operator-schema';
1413

‎packages/angular_devkit/architect/node/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ts_library(
4040
":node",
4141
"//packages/angular_devkit/architect",
4242
"//tests/angular_devkit/architect/node/jobs:jobs_test_lib",
43+
"@npm//rxjs",
4344
],
4445
)
4546

‎packages/angular_devkit/architect/node/jobs/job-registry_spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import { jobs } from '@angular-devkit/architect';
1010
import * as path from 'path';
11+
import { lastValueFrom } from 'rxjs';
1112
import { NodeModuleJobRegistry } from './job-registry';
1213

1314
const root = path.join(__dirname, '../../../../../tests/angular_devkit/architect/node/jobs');
@@ -18,6 +19,6 @@ describe('NodeModuleJobScheduler', () => {
1819
const scheduler = new jobs.SimpleScheduler(registry);
1920

2021
const job = scheduler.schedule(path.join(root, 'add'), [1, 2, 3]);
21-
expect(await job.output.toPromise()).toBe(6);
22+
expect(await lastValueFrom(job.output)).toBe(6);
2223
});
2324
});

‎packages/angular_devkit/architect/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"typings": "src/index.d.ts",
88
"dependencies": {
99
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
10-
"rxjs": "6.6.7"
10+
"rxjs": "7.8.0"
1111
},
1212
"builders": "./builders/builders.json"
1313
}

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
*/
88

99
import { json, logging } from '@angular-devkit/core';
10-
import { Observable, SubscribableOrPromise, Subscriber, from } from 'rxjs';
11-
import { switchMap } from 'rxjs/operators';
10+
import { Observable, ObservableInput, Subscriber, from, switchMap } from 'rxjs';
1211
import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
1312
import { Registry } from './jobs';
1413
import { Schema as RealBuilderOutput } from './output-schema';
@@ -77,6 +76,12 @@ export interface BuilderRun {
7776
*/
7877
result: Promise<BuilderOutput>;
7978

79+
/**
80+
* The last output from a builder. This is recommended when scheduling a builder and only being
81+
* interested in the result of that last run.
82+
*/
83+
lastOutput: Promise<BuilderOutput>;
84+
8085
/**
8186
* The output(s) from the builder. A builder can have multiple outputs.
8287
* This always replay the last output when subscribed.
@@ -248,10 +253,7 @@ export interface BuilderContext {
248253
/**
249254
* An accepted return value from a builder. Can be either an Observable, a Promise or a vector.
250255
*/
251-
export type BuilderOutputLike =
252-
| AsyncIterable<BuilderOutput>
253-
| SubscribableOrPromise<BuilderOutput>
254-
| BuilderOutput;
256+
export type BuilderOutputLike = ObservableInput<BuilderOutput> | BuilderOutput;
255257

256258
// eslint-disable-next-line @typescript-eslint/no-explicit-any
257259
export function isBuilderOutput(obj: any): obj is BuilderOutput {

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,20 @@
77
*/
88

99
import { json, logging } from '@angular-devkit/core';
10-
import { Observable, from, merge, of, onErrorResumeNext } from 'rxjs';
1110
import {
11+
Observable,
1212
concatMap,
1313
first,
14+
from,
1415
ignoreElements,
1516
last,
1617
map,
18+
merge,
19+
of,
20+
onErrorResumeNext,
1721
shareReplay,
1822
takeUntil,
19-
} from 'rxjs/operators';
23+
} from 'rxjs';
2024
import {
2125
BuilderInfo,
2226
BuilderInput,

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

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,18 @@
77
*/
88

99
import { json, logging } from '@angular-devkit/core';
10-
import { Observable, Subscription, from, isObservable, of, throwError } from 'rxjs';
11-
import { defaultIfEmpty, mergeMap, tap } from 'rxjs/operators';
10+
import {
11+
Observable,
12+
Subscription,
13+
defaultIfEmpty,
14+
firstValueFrom,
15+
from,
16+
isObservable,
17+
mergeMap,
18+
of,
19+
tap,
20+
throwError,
21+
} from 'rxjs';
1222
import {
1323
BuilderContext,
1424
BuilderHandlerFn,
@@ -141,33 +151,39 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
141151
return run;
142152
},
143153
async getTargetOptions(target: Target) {
144-
return scheduler
145-
.schedule<Target, json.JsonValue, json.JsonObject>('..getTargetOptions', target)
146-
.output.toPromise();
154+
return firstValueFrom(
155+
scheduler.schedule<Target, json.JsonValue, json.JsonObject>(
156+
'..getTargetOptions',
157+
target,
158+
).output,
159+
);
147160
},
148161
async getProjectMetadata(target: Target | string) {
149-
return scheduler
150-
.schedule<Target | string, json.JsonValue, json.JsonObject>(
162+
return firstValueFrom(
163+
scheduler.schedule<Target | string, json.JsonValue, json.JsonObject>(
151164
'..getProjectMetadata',
152165
target,
153-
)
154-
.output.toPromise();
166+
).output,
167+
);
155168
},
156169
async getBuilderNameForTarget(target: Target) {
157-
return scheduler
158-
.schedule<Target, json.JsonValue, string>('..getBuilderNameForTarget', target)
159-
.output.toPromise();
170+
return firstValueFrom(
171+
scheduler.schedule<Target, json.JsonValue, string>(
172+
'..getBuilderNameForTarget',
173+
target,
174+
).output,
175+
);
160176
},
161177
async validateOptions<T extends json.JsonObject = json.JsonObject>(
162178
options: json.JsonObject,
163179
builderName: string,
164180
) {
165-
return scheduler
166-
.schedule<[string, json.JsonObject], json.JsonValue, T>('..validateOptions', [
167-
builderName,
168-
options,
169-
])
170-
.output.toPromise();
181+
return firstValueFrom(
182+
scheduler.schedule<[string, json.JsonObject], json.JsonValue, T>(
183+
'..validateOptions',
184+
[builderName, options],
185+
).output,
186+
);
171187
},
172188
reportRunning() {
173189
switch (currentState) {

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
*/
88

99
import { json, logging, schema } from '@angular-devkit/core';
10-
import { timer } from 'rxjs';
11-
import { map, take, tap, toArray } from 'rxjs/operators';
10+
import { firstValueFrom, lastValueFrom, map, take, tap, timer, toArray } from 'rxjs';
1211
import { promisify } from 'util';
1312
import { TestingArchitectHost } from '../testing/testing-architect-host';
1413
import { BuilderOutput, BuilderRun } from './api';
@@ -173,7 +172,7 @@ describe('architect', () => {
173172
expect(called).toBe(1);
174173
expect(results).toBe(1);
175174

176-
const all = await run.output.pipe(toArray()).toPromise();
175+
const all = await lastValueFrom(run.output.pipe(toArray()));
177176
expect(called).toBe(1);
178177
expect(results).toBe(10);
179178
expect(all.length).toBe(10);
@@ -200,7 +199,7 @@ describe('architect', () => {
200199
expect(called).toBe(1);
201200
expect(results).toBe(1);
202201

203-
const all = await run.output.pipe(toArray()).toPromise();
202+
const all = await lastValueFrom(run.output.pipe(toArray()));
204203
expect(called).toBe(1);
205204
expect(results).toBe(10);
206205
expect(all.length).toBe(10);
@@ -325,7 +324,7 @@ describe('architect', () => {
325324
);
326325

327326
const run = await architect.scheduleBuilder('package:getTargetOptions', {});
328-
const output = await run.output.toPromise();
327+
const output = await lastValueFrom(run.output);
329328
expect(output.success).toBe(true);
330329
expect(options).toEqual(goldenOptions);
331330
await run.stop();
@@ -339,7 +338,7 @@ describe('architect', () => {
339338

340339
// But this should.
341340
try {
342-
await run2.output.toPromise();
341+
await lastValueFrom(run2.output);
343342
expect('THE ABOVE LINE SHOULD NOT ERROR').toBe('false');
344343
} catch {}
345344
await run2.stop();
@@ -369,7 +368,7 @@ describe('architect', () => {
369368
);
370369

371370
const run = await architect.scheduleBuilder('package:do-it', {});
372-
const output = await run.output.toPromise();
371+
const output = await lastValueFrom(run.output);
373372
expect(output.success).toBe(true);
374373
expect(actualBuilderName).toEqual(builderName);
375374
await run.stop();
@@ -383,7 +382,7 @@ describe('architect', () => {
383382

384383
// But this should.
385384
try {
386-
await run2.output.toPromise();
385+
await lastValueFrom(run2.output);
387386
expect('THE ABOVE LINE SHOULD NOT ERROR').toBe('false');
388387
} catch {}
389388
await run2.stop();
@@ -416,7 +415,7 @@ describe('architect', () => {
416415
);
417416

418417
const run = await architect.scheduleBuilder('package:do-it', { p1: 'hello' });
419-
const output = await run.output.toPromise();
418+
const output = await firstValueFrom(run.output);
420419
expect(output.success).toBe(true);
421420
expect(actualOptions).toEqual({
422421
p0: 123,
@@ -427,7 +426,7 @@ describe('architect', () => {
427426
// Should also error.
428427
const run2 = await architect.scheduleBuilder('package:do-it', {});
429428

430-
await expectAsync(run2.output.toPromise()).toBeRejectedWith(
429+
await expectAsync(lastValueFrom(run2.output)).toBeRejectedWith(
431430
jasmine.objectContaining({ message: jasmine.stringMatching('p1') }),
432431
);
433432

‎packages/angular_devkit/architect/src/jobs/create-job-handler.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,17 @@
77
*/
88

99
import { BaseException, JsonValue, isPromise, logging } from '@angular-devkit/core';
10-
import { Observable, Observer, Subject, Subscription, from, isObservable, of } from 'rxjs';
11-
import { switchMap, tap } from 'rxjs/operators';
10+
import {
11+
Observable,
12+
Observer,
13+
Subject,
14+
Subscription,
15+
from,
16+
isObservable,
17+
of,
18+
switchMap,
19+
tap,
20+
} from 'rxjs';
1221
import {
1322
JobDescription,
1423
JobHandler,

0 commit comments

Comments
 (0)