feat: update to RxJS 7.4.x (#3109)

Author: brandonroberts

modules/component-store/jest.config.js

@@ -2,7 +2,6 @@ module.exports = {
   displayName: 'Component Store',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/libs/component-store',
-
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
   globals: {
     'ts-jest': {

modules/component-store/package.json

@@ -23,7 +23,7 @@
   "homepage": "https://github.com/ngrx/platform#readme",
   "peerDependencies": {
     "@angular/core": "^12.0.0",
-    "rxjs": "^6.5.3"
+    "rxjs": "^6.5.3 || ^7.0.0"
   },
   "schematics": "./schematics/collection.json",
   "sideEffects": false,

modules/component-store/spec/component-store.spec.ts

@@ -9,6 +9,9 @@ import {
   timer,
   Observable,
   from,
+  scheduled,
+  queueScheduler,
+  asyncScheduler,
 } from 'rxjs';
 import {
   delayWhen,
@@ -754,9 +757,9 @@ describe('Component Store', () => {
           (s1, o) => o + ' ' + s1
         );
 
-        componentStore.updater((state, newValue: string) => ({
-          value: newValue,
-        }))(updater$);
+        scheduled(updater$, asyncScheduler).subscribe((value) => {
+          componentStore.setState({ value });
+        });
 
         m.expect(selector$).toBeObservable(expectedSelector$);
       })
@@ -823,9 +826,9 @@ describe('Component Store', () => {
           (s1, o) => o + ' ' + s1
         );
 
-        componentStore.updater((state, newValue: string) => ({
-          value: newValue,
-        }))(updater$);
+        scheduled(updater$, asyncScheduler).subscribe((value) => {
+          componentStore.setState({ value });
+        });
 
         m.expect(selector$).toBeObservable(expectedSelector$);
       })
@@ -1025,10 +1028,7 @@ describe('Component Store', () => {
         componentStore.setState(() => ({ value: 'new value', updated: true }));
         m.flush();
 
-        expect(selectorResults).toEqual([
-          { result: 'empty' },
-          { result: 'new value' },
-        ]);
+        expect(selectorResults).toEqual([{ result: 'new value' }]);
       })
     );
 
@@ -1059,9 +1059,9 @@ describe('Component Store', () => {
           { debounce: true }
         );
 
-        componentStore.updater((state, newValue: string) => ({
-          value: newValue,
-        }))(updater$);
+        scheduled(updater$, queueScheduler).subscribe((value) => {
+          componentStore.setState({ value });
+        });
 
         m.expect(selector$).toBeObservable(expectedSelector$);
       })
@@ -1125,9 +1125,9 @@ describe('Component Store', () => {
           { debounce: true }
         );
 
-        componentStore.updater((state, newValue: string) => ({
-          value: newValue,
-        }))(updater$);
+        scheduled(updater$, queueScheduler).subscribe((value) => {
+          componentStore.setState({ value });
+        });
 
         m.expect(selector$).toBeObservable(expectedSelector$);
       })

modules/component-store/src/component-store.ts

@@ -101,7 +101,7 @@ export class ComponentStore<T extends object> implements OnDestroy {
       ? () => void
       : (observableOrValue: ValueType | Observable<ValueType>) => Subscription
   >(updaterFn: (state: T, value: OriginType) => T): ReturnType {
-    return (((
+    return ((
       observableOrValue?: OriginType | Observable<OriginType>
     ): Subscription => {
       let initializationError: Error | undefined;
@@ -140,7 +140,7 @@ export class ComponentStore<T extends object> implements OnDestroy {
         throw /** @type {!Error} */ (initializationError);
       }
       return subscription;
-    }) as unknown) as ReturnType;
+    }) as unknown as ReturnType;
   }
 
   /**
@@ -296,17 +296,17 @@ export class ComponentStore<T extends object> implements OnDestroy {
       .pipe(takeUntil(this.destroy$))
       .subscribe();
 
-    return (((
+    return ((
       observableOrValue?: ObservableType | Observable<ObservableType>
     ): Subscription => {
       const observable$ = isObservable(observableOrValue)
         ? observableOrValue
         : of(observableOrValue);
       return observable$.pipe(takeUntil(this.destroy$)).subscribe((value) => {
         // any new 👇 value is pushed into a stream
-        origin$.next(value);
+        origin$.next(value as ObservableType);
       });
-    }) as unknown) as ReturnType;
+    }) as unknown as ReturnType;
   }
 }
 

modules/component/jest.config.js

@@ -9,6 +9,5 @@ module.exports = {
     },
   },
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
-
   transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
 };

modules/component/package.json

@@ -22,7 +22,7 @@
   "peerDependencies": {
     "@angular/common": "^12.0.0",
     "@angular/core": "^12.0.0",
-    "rxjs": "^6.5.3"
+    "rxjs": "^6.5.3 || ^7.0.0"
   },
   "schematics": "./schematics/collection.json",
   "sideEffects": false,

modules/component/spec/core/cd-aware/cd-aware_creator.spec.ts

@@ -44,7 +44,7 @@ class CdAwareImplementation<U> implements OnDestroy {
       resetContextObserver: this.resetContextObserver,
       errorHandler,
     });
-    this.subscription = this.cdAware.subscribe();
+    this.subscription = this.cdAware.subscribe({});
   }
 
   ngOnDestroy(): void {

modules/component/src/let/let.directive.ts

@@ -165,7 +165,7 @@ export class LetDirective<U> implements OnDestroy {
       updateViewContextObserver: this.updateViewContextObserver,
       errorHandler,
     });
-    this.subscription = this.cdAware.subscribe();
+    this.subscription = this.cdAware.subscribe({});
   }
 
   createEmbeddedView() {

modules/component/src/push/push.pipe.ts

@@ -79,7 +79,7 @@ export class PushPipe<S> implements PipeTransform, OnDestroy {
       resetContextObserver: this.resetContextObserver,
       errorHandler,
     });
-    this.subscription = this.cdAware.subscribe();
+    this.subscription = this.cdAware.subscribe({});
   }
 
   transform<T>(potentialObservable: null): null;

modules/data/jest.config.js

@@ -2,7 +2,6 @@ module.exports = {
   displayName: 'Data',
   preset: '../../jest.preset.js',
   coverageDirectory: '../../coverage/modules/data',
-
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
   globals: {
     'ts-jest': {