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

Author: alan-agius4

bin/devkit-admin

@@ -35,7 +35,7 @@ let logger = null;
 try {
   logger = new (require('@angular-devkit/core').logging.IndentLogger)('root');
   const colors = require('ansi-colors').create();
-  const filter = require('rxjs/operators').filter;
+  const filter = require('rxjs').filter;
 
   logger
     .pipe(filter(entry => (entry.level !== 'debug' || args.verbose)))

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

@@ -10,9 +10,9 @@ import { JsonObject } from '@angular-devkit/core';
 import { JsonValue } from '@angular-devkit/core';
 import { logging } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
+import { ObservableInput } from 'rxjs';
 import { Observer } from 'rxjs';
 import { schema } from '@angular-devkit/core';
-import { SubscribableOrPromise } from 'rxjs';
 
 // @public (undocumented)
 export class Architect {
@@ -67,7 +67,7 @@ export type BuilderInput = json.JsonObject & Schema;
 export type BuilderOutput = json.JsonObject & Schema_2;
 
 // @public
-export type BuilderOutputLike = AsyncIterable<BuilderOutput> | SubscribableOrPromise<BuilderOutput> | BuilderOutput;
+export type BuilderOutputLike = ObservableInput<BuilderOutput> | BuilderOutput;
 
 // @public (undocumented)
 export type BuilderProgress = json.JsonObject & Schema_3 & TypedBuilderProgress;
@@ -97,6 +97,7 @@ export type BuilderRegistry = Registry<json.JsonObject, BuilderInput, BuilderOut
 export interface BuilderRun {
     id: number;
     info: BuilderInfo;
+    lastOutput: Promise<BuilderOutput>;
     output: Observable<BuilderOutput>;
     progress: Observable<BuilderProgressReport>;
     result: Promise<BuilderOutput>;

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

@@ -7,11 +7,11 @@
 import { ErrorObject } from 'ajv';
 import { Format } from 'ajv';
 import { Observable } from 'rxjs';
+import { ObservableInput } from 'rxjs';
 import { Operator } from 'rxjs';
 import { PartialObserver } from 'rxjs';
 import { Position } from 'source-map';
 import { Subject } from 'rxjs';
-import { SubscribableOrPromise } from 'rxjs';
 import { Subscription } from 'rxjs';
 import { ValidateFunction } from 'ajv';
 
@@ -715,7 +715,7 @@ interface PromptDefinition {
 }
 
 // @public (undocumented)
-type PromptProvider = (definitions: Array<PromptDefinition>) => SubscribableOrPromise<{
+type PromptProvider = (definitions: Array<PromptDefinition>) => ObservableInput<{
     [id: string]: JsonValue;
 }>;
 

package.json

@@ -194,7 +194,7 @@
     "puppeteer": "18.2.1",
     "quicktype-core": "21.0.13",
     "resolve-url-loader": "5.0.0",
-    "rxjs": "6.6.7",
+    "rxjs": "7.8.0",
     "sass": "1.58.0",
     "sass-loader": "13.2.0",
     "sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.8.1-linux.tar.gz",

packages/angular/cli/BUILD.bazel

@@ -142,7 +142,6 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics/testing",
         "@npm//@types/semver",
-        "@npm//rxjs",
     ],
 )
 

packages/angular/cli/package.json

@@ -41,9 +41,6 @@
     "symbol-observable": "4.0.0",
     "yargs": "17.6.2"
   },
-  "devDependencies": {
-    "rxjs": "6.6.7"
-  },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {

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

@@ -85,8 +85,7 @@ export abstract class ArchitectBaseCommandModule<T extends object>
     }
 
     try {
-      const { error, success } = await run.output.toPromise();
-
+      const { error, success } = await run.lastOutput;
       if (error) {
         logger.error(error);
       }

packages/angular/cli/src/command-builder/utilities/json-schema.ts

@@ -7,6 +7,7 @@
  */
 
 import { json } from '@angular-devkit/core';
+import assert from 'node:assert';
 import yargs from 'yargs';
 
 /**
@@ -198,6 +199,8 @@ export async function parseJsonSchemaToOptions(
   }
 
   const flattenedSchema = await registry.flatten(schema).toPromise();
+  // TODO(RXJS): temporary assert to avoid adding rxjs dependency.
+  assert(flattenedSchema);
   json.schema.visitJsonSchema(flattenedSchema, visitor);
 
   // Sort by positional and name.

packages/angular/cli/src/utilities/config.ts

@@ -8,6 +8,7 @@
 
 import { json, workspaces } from '@angular-devkit/core';
 import { existsSync, promises as fs } from 'fs';
+import assert from 'node:assert';
 import * as os from 'os';
 import * as path from 'path';
 import { PackageManager } from '../../lib/config/workspace-schema';
@@ -254,8 +255,12 @@ export async function validateWorkspace(data: json.JsonObject, isGlobal: boolean
   const { formats } = await import('@angular-devkit/schematics');
   const registry = new json.schema.CoreSchemaRegistry(formats.standardFormats);
   const validator = await registry.compile(schemaToValidate).toPromise();
-
-  const { success, errors } = await validator(data).toPromise();
+  // TODO(RXJS): temporary assert to avoid adding rxjs dependency.
+  assert(validator);
+  const result = await validator(data).toPromise();
+  // TODO(RXJS): temporary assert to avoid adding rxjs dependency.
+  assert(result);
+  const { success, errors } = result;
   if (!success) {
     throw new json.schema.SchemaValidationException(errors);
   }

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

@@ -7,8 +7,7 @@
  */
 
 import { json } from '@angular-devkit/core';
-import { EMPTY, from, of } from 'rxjs';
-import { map, mergeMap } from 'rxjs/operators';
+import { EMPTY, from, map, mergeMap, of } from 'rxjs';
 import { BuilderOutput, BuilderRun, createBuilder } from '../src';
 import { Schema as OperatorSchema } from './operator-schema';
 

packages/angular_devkit/architect/builders/concat.ts

@@ -7,8 +7,7 @@
  */
 
 import { json } from '@angular-devkit/core';
-import { from, of } from 'rxjs';
-import { concatMap, first, last, map, switchMap } from 'rxjs/operators';
+import { concatMap, first, from, last, map, of, switchMap } from 'rxjs';
 import { BuilderOutput, BuilderRun, createBuilder } from '../src';
 import { Schema as OperatorSchema } from './operator-schema';
 

packages/angular_devkit/architect/node/BUILD.bazel

@@ -40,6 +40,7 @@ ts_library(
         ":node",
         "//packages/angular_devkit/architect",
         "//tests/angular_devkit/architect/node/jobs:jobs_test_lib",
+        "@npm//rxjs",
     ],
 )
 

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

@@ -8,6 +8,7 @@
 
 import { jobs } from '@angular-devkit/architect';
 import * as path from 'path';
+import { lastValueFrom } from 'rxjs';
 import { NodeModuleJobRegistry } from './job-registry';
 
 const root = path.join(__dirname, '../../../../../tests/angular_devkit/architect/node/jobs');
@@ -18,6 +19,6 @@ describe('NodeModuleJobScheduler', () => {
     const scheduler = new jobs.SimpleScheduler(registry);
 
     const job = scheduler.schedule(path.join(root, 'add'), [1, 2, 3]);
-    expect(await job.output.toPromise()).toBe(6);
+    expect(await lastValueFrom(job.output)).toBe(6);
   });
 });

packages/angular_devkit/architect/package.json

@@ -7,7 +7,7 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "@angular-devkit/core": "0.0.0-PLACEHOLDER",
-    "rxjs": "6.6.7"
+    "rxjs": "7.8.0"
   },
   "builders": "./builders/builders.json"
 }

packages/angular_devkit/architect/src/api.ts

@@ -7,8 +7,7 @@
  */
 
 import { json, logging } from '@angular-devkit/core';
-import { Observable, SubscribableOrPromise, Subscriber, from } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { Observable, ObservableInput, Subscriber, from, switchMap } from 'rxjs';
 import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
 import { Registry } from './jobs';
 import { Schema as RealBuilderOutput } from './output-schema';
@@ -77,6 +76,12 @@ export interface BuilderRun {
    */
   result: Promise<BuilderOutput>;
 
+  /**
+   * The last output from a builder. This is recommended when scheduling a builder and only being
+   * interested in the result of that last run.
+   */
+  lastOutput: Promise<BuilderOutput>;
+
   /**
    * The output(s) from the builder. A builder can have multiple outputs.
    * This always replay the last output when subscribed.
@@ -248,10 +253,7 @@ export interface BuilderContext {
 /**
  * An accepted return value from a builder. Can be either an Observable, a Promise or a vector.
  */
-export type BuilderOutputLike =
-  | AsyncIterable<BuilderOutput>
-  | SubscribableOrPromise<BuilderOutput>
-  | BuilderOutput;
+export type BuilderOutputLike = ObservableInput<BuilderOutput> | BuilderOutput;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function isBuilderOutput(obj: any): obj is BuilderOutput {

packages/angular_devkit/architect/src/architect.ts

@@ -7,17 +7,22 @@
  */
 
 import { json, logging } from '@angular-devkit/core';
-import { Observable, from, merge, of, onErrorResumeNext } from 'rxjs';
 import {
+  Observable,
   concatMap,
   first,
+  firstValueFrom,
+  from,
   ignoreElements,
   last,
   map,
+  merge,
+  of,
+  onErrorResumeNext,
   shareReplay,
   switchMap,
   takeUntil,
-} from 'rxjs/operators';
+} from 'rxjs';
 import {
   BuilderInfo,
   BuilderInput,
@@ -335,9 +340,8 @@ function _validateOptionsFactory(host: ArchitectHost, registry: json.schema.Sche
         throw new Error(`No builder info were found for builder ${JSON.stringify(builderName)}.`);
       }
 
-      return registry
-        .compile(builderInfo.optionSchema)
-        .pipe(
+      return firstValueFrom(
+        registry.compile(builderInfo.optionSchema).pipe(
           concatMap((validation) => validation(options)),
           switchMap(({ data, success, errors }) => {
             if (success) {
@@ -346,8 +350,8 @@ function _validateOptionsFactory(host: ArchitectHost, registry: json.schema.Sche
 
             throw new json.schema.SchemaValidationException(errors);
           }),
-        )
-        .toPromise();
+        ),
+      );
     },
     {
       name: '..validateOptions',

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

@@ -7,8 +7,18 @@
  */
 
 import { json, logging } from '@angular-devkit/core';
-import { Observable, Subscription, from, isObservable, of, throwError } from 'rxjs';
-import { defaultIfEmpty, mergeMap, tap } from 'rxjs/operators';
+import {
+  Observable,
+  Subscription,
+  defaultIfEmpty,
+  firstValueFrom,
+  from,
+  isObservable,
+  mergeMap,
+  of,
+  tap,
+  throwError,
+} from 'rxjs';
 import {
   BuilderContext,
   BuilderHandlerFn,
@@ -141,33 +151,39 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
             return run;
           },
           async getTargetOptions(target: Target) {
-            return scheduler
-              .schedule<Target, json.JsonValue, json.JsonObject>('..getTargetOptions', target)
-              .output.toPromise();
+            return firstValueFrom(
+              scheduler.schedule<Target, json.JsonValue, json.JsonObject>(
+                '..getTargetOptions',
+                target,
+              ).output,
+            );
           },
           async getProjectMetadata(target: Target | string) {
-            return scheduler
-              .schedule<Target | string, json.JsonValue, json.JsonObject>(
+            return firstValueFrom(
+              scheduler.schedule<Target | string, json.JsonValue, json.JsonObject>(
                 '..getProjectMetadata',
                 target,
-              )
-              .output.toPromise();
+              ).output,
+            );
           },
           async getBuilderNameForTarget(target: Target) {
-            return scheduler
-              .schedule<Target, json.JsonValue, string>('..getBuilderNameForTarget', target)
-              .output.toPromise();
+            return firstValueFrom(
+              scheduler.schedule<Target, json.JsonValue, string>(
+                '..getBuilderNameForTarget',
+                target,
+              ).output,
+            );
           },
           async validateOptions<T extends json.JsonObject = json.JsonObject>(
             options: json.JsonObject,
             builderName: string,
           ) {
-            return scheduler
-              .schedule<[string, json.JsonObject], json.JsonValue, T>('..validateOptions', [
-                builderName,
-                options,
-              ])
-              .output.toPromise();
+            return firstValueFrom(
+              scheduler.schedule<[string, json.JsonObject], json.JsonValue, T>(
+                '..validateOptions',
+                [builderName, options],
+              ).output,
+            );
           },
           reportRunning() {
             switch (currentState) {