build: update rxjs build version to v7

The version of rxjs used to build the repository has been updated to v7. This required only minimal changes to the code. Most of which were type related only due to more strict types in v7. The behavior in those cases was left intact. The one change that was not type related was to provide a parameter value to the `defaultIfEmpty` operator. It no longer defaults to a value of `null` if no default is provided. To provide the same behavior the value of `null` is now passed to the operator.
clydin · Dec 11, 2023 · 0c08680 · 0c08680
1 parent e3a6bf9
commit 0c08680
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 24 deletions.
diff --git a/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts b/modules/benchmarks/src/expanding_rows/expanding_row_details_caption.ts
@@ -35,7 +35,7 @@ export class ExpandingRowDetailsCaption implements OnDestroy {
   @Input() color: string = 'blue';
 
   /** This is triggered when this component is destroyed. */
-  private readonly onDestroy = new Subject();
+  private readonly onDestroy = new Subject<void>();
 
   /**
    * We need a reference to parent cfc-expanding-row component here to hide

diff --git a/package.json b/package.json
@@ -131,7 +131,7 @@
     "rollup": "~2.79.0",
     "rollup-plugin-preserve-shebang": "^1.0.1",
     "rollup-plugin-sourcemaps": "^0.6.3",
-    "rxjs": "^6.6.7",
+    "rxjs": "^7.0.0",
     "selenium-webdriver": "3.5.0",
     "selenium-webdriver4": "npm:selenium-webdriver@4.14.0",
     "semver-dsl": "^1.0.1",

diff --git a/packages/core/src/event_emitter.ts b/packages/core/src/event_emitter.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/// <reference types="rxjs" />
-
 import {PartialObserver, Subject, Subscription} from 'rxjs';
 
 /**

diff --git a/packages/router/src/navigation_transition.ts b/packages/router/src/navigation_transition.ts
@@ -599,7 +599,7 @@ export class NavigationTransitions {
                                  return loaders;
                                };
                            return combineLatest(loadComponents(t.targetSnapshot!.root))
-                               .pipe(defaultIfEmpty(), take(1));
+                               .pipe(defaultIfEmpty(null), take(1));
                          }),
 
                          switchTap(() => this.afterPreactivation()),

diff --git a/packages/service-worker/src/low_level.ts b/packages/service-worker/src/low_level.ts
@@ -193,13 +193,13 @@ export class NgswCommChannel {
 
   waitForOperationCompleted(nonce: number): Promise<boolean> {
     return this.eventsOfType<OperationCompletedEvent>('OPERATION_COMPLETED')
-        .pipe(filter(event => event.nonce === nonce), take(1), map(event => {
-                if (event.result !== undefined) {
-                  return event.result;
-                }
-                throw new Error(event.error!);
-              }))
-        .toPromise();
+               .pipe(filter(event => event.nonce === nonce), take(1), map(event => {
+                       if (event.result !== undefined) {
+                         return event.result;
+                       }
+                       throw new Error(event.error!);
+                     }))
+               .toPromise() as Promise<boolean>;
   }
 
   get isEnabled(): boolean {

diff --git a/packages/service-worker/src/push.ts b/packages/service-worker/src/push.ts
@@ -176,8 +176,8 @@ export class SwPush {
     return this.pushManager.pipe(switchMap(pm => pm.subscribe(pushOptions)), take(1))
         .toPromise()
         .then(sub => {
-          this.subscriptionChanges.next(sub);
-          return sub;
+          this.subscriptionChanges.next(sub!);
+          return sub!;
         });
   }
 

diff --git a/tools/rxjs/BUILD.bazel b/tools/rxjs/BUILD.bazel
@@ -4,6 +4,6 @@ filegroup(
     name = "rxjs_umd_modules",
     srcs = [
         ":rxjs_shims.js",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
+        "@npm//:node_modules/rxjs/dist/bundles/rxjs.umd.js",
     ],
 )
diff --git a/yarn.lock b/yarn.lock
@@ -13884,20 +13884,13 @@ rx@4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==
 
-rxjs@7.8.1, rxjs@^7.2.0, rxjs@^7.5.5, rxjs@^7.8.1:
+rxjs@7.8.1, rxjs@^7.0.0, rxjs@^7.2.0, rxjs@^7.5.5, rxjs@^7.8.1:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
-rxjs@^6.6.7:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -15348,7 +15341,7 @@ tslib@2.6.2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
-tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.13.0, tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==