fixup! build: update to rxjs 7

alan-agius4 · alan-agius4 · commit 5e2213f51ab6 · 2022-12-05T11:59:38.000Z
diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/base-href_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/base-href_spec.ts
@@ -55,7 +55,7 @@ describe('Browser Builder base href', () => {
 
     expect(output.success).toBeTrue();
     const fileName = join(normalize(output.outputs[0].path), 'index.html');
-    const content = virtualFs.fileBufferToString(await host.read(fileName).toPromise());
+    const content = virtualFs.fileBufferToString(await lastValueFrom(host.read(fileName)));
     expect(content).toContain(`<base href=".">`);
 
     await run.stop();
diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/deploy-url_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/deploy-url_spec.ts
@@ -9,6 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { lastValueFrom } from 'rxjs';
 import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder deploy url', () => {
@@ -40,18 +41,22 @@ describe('Browser Builder deploy url', () => {
 
     const fileName = join(outputPath, 'index.html');
     const runtimeFileName = join(outputPath, 'runtime.js');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    const content = virtualFs.fileBufferToString(
+      await lastValueFrom(host.read(normalize(fileName))),
+    );
     expect(content).toContain('deployUrl/main.js');
     const runtimeContent = virtualFs.fileBufferToString(
-      await host.read(normalize(runtimeFileName)).toPromise(),
+      await lastValueFrom(host.read(normalize(runtimeFileName))),
     );
     expect(runtimeContent).toContain('deployUrl/');
 
     const run2 = await architect.scheduleTarget(targetSpec, overrides2);
     const output2 = (await run2.result) as BrowserBuilderOutput;
     expect(output2.outputPath).toEqual(outputPath); // These should be the same.
 
-    const content2 = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    const content2 = virtualFs.fileBufferToString(
+      await lastValueFrom(host.read(normalize(fileName))),
+    );
     expect(content2).toContain('http://example.com/some/path/main.js');
 
     await run.stop();
diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/index_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/index_spec.ts
@@ -84,7 +84,9 @@ describe('Browser Builder index HTML processing', () => {
     const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const fileName = join(normalize(output.outputPath), 'index.html');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    const content = virtualFs.fileBufferToString(
+      await lastValueFrom(host.read(normalize(fileName))),
+    );
     expect(content).toBe(
       `<html><head><title>&iacute;</title><base href="/"><link rel="stylesheet" href="styles.css"></head> ` +
         `<body><app-root></app-root><script src="runtime.js" type="module"></script>` +
@@ -156,7 +158,7 @@ describe('Browser Builder index HTML processing', () => {
     await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
     const outputIndexPath = join(host.root(), 'dist', 'index.html');
-    const content = await host.read(normalize(outputIndexPath)).toPromise();
+    const content = await lastValueFrom(host.read(normalize(outputIndexPath)));
     expect(virtualFs.fileBufferToString(content)).toBe(
       `<html><head><base href="/"><%= csrf_meta_tags %><link rel="stylesheet" href="styles.css"></head> ` +
         `<body><app-root></app-root><script src="runtime.js" type="module"></script>` +
@@ -203,7 +205,7 @@ describe('Browser Builder index HTML processing', () => {
     await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
     const outputIndexPath = join(host.root(), 'dist', 'main.html');
-    const content = await host.read(normalize(outputIndexPath)).toPromise();
+    const content = await lastValueFrom(host.read(normalize(outputIndexPath)));
     expect(virtualFs.fileBufferToString(content)).toBe(
       `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head> ` +
         `<body><app-root></app-root><script src="runtime.js" type="module"></script>` +
@@ -250,7 +252,7 @@ describe('Browser Builder index HTML processing', () => {
     await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
     const outputIndexPath = join(host.root(), 'dist', 'extra', 'main.html');
-    const content = await host.read(normalize(outputIndexPath)).toPromise();
+    const content = await lastValueFrom(host.read(normalize(outputIndexPath)));
     expect(virtualFs.fileBufferToString(content)).toBe(
       `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head> ` +
         `<body><app-root></app-root><script src="runtime.js" type="module"></script>` +
diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/replacements_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/replacements_spec.ts
@@ -182,7 +182,7 @@ describe('Browser Builder file replacements', () => {
     const logger = new logging.Logger('');
 
     // Race between a timeout and the expected log entry.
-    const stop$ = race<null | string>(
+    const stop$ = race(
       of(null).pipe(delay((45000 * 2) / 3)),
       logger.pipe(
         filter((entry) => entry.message.includes(expectedError)),
diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/web-worker_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/web-worker_spec.ts
@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { join, logging, virtualFs } from '@angular-devkit/core';
-import { timer } from 'rxjs';
+import { lastValueFrom, timer } from 'rxjs';
 import { debounceTime, map, switchMap, takeWhile, tap } from 'rxjs/operators';
 import { browserBuild, createArchitect, host, outputPath } from '../../../testing/test-utils';
 
@@ -150,8 +150,8 @@ describe('Browser Builder Web Worker support', () => {
     // The current linux-based CI environments may not fully settled in regards to filesystem
     // changes from previous tests which reuse the same directory and fileset.
     // The initial delay helps mitigate false positive rebuild triggers in such scenarios.
-    const { run } = await timer(1000)
-      .pipe(
+    const { run } = await lastValueFrom(
+      timer(1000).pipe(
         switchMap(() => architect.scheduleTarget(target, overrides)),
         switchMap((run) => run.output.pipe(map((output) => ({ run, output })))),
         debounceTime(1000),
@@ -176,8 +176,8 @@ describe('Browser Builder Web Worker support', () => {
           }
         }),
         takeWhile(() => phase < 3),
-      )
-      .toPromise();
+      ),
+    );
     await run.stop();
   });
 });
