Merge pull request rx-angular#1404 from rx-angular/fix-rxjs-6-compat

hoebbelsB · web-flow · commit afa6bee0a083 · 2022-09-08T13:18:16.000+02:00
fix: use rxjs version 6 compatible imports
diff --git a/libs/cdk/coercing/src/lib/coerceObservable.ts b/libs/cdk/coercing/src/lib/coerceObservable.ts
@@ -5,8 +5,6 @@ import { isObservable, Observable, ObservableInput, of } from 'rxjs';
  *
  * @param o - the value to coerce
  */
-export function coerceObservable<T>(
-  o: ObservableInput<T> | T
-): Observable<T> {
+export function coerceObservable<T>(o: ObservableInput<T> | T): Observable<T> {
   return isObservable(o) ? o : of(o as T);
 }
diff --git a/libs/cdk/template/src/lib/template-manager.ts b/libs/cdk/template/src/lib/template-manager.ts
@@ -13,18 +13,15 @@ import {
   RxRenderWork,
   strategyHandling,
 } from '@rx-angular/cdk/render-strategies';
+import { EMPTY, merge, Observable, of } from 'rxjs';
 import {
   catchError,
-  EMPTY,
   filter,
   map,
-  merge,
-  Observable,
-  of,
   switchMap,
   tap,
   withLatestFrom,
-} from 'rxjs';
+} from 'rxjs/operators';
 import {
   rxBaseTemplateNames,
   RxRenderAware,
diff --git a/libs/template/for/src/lib/for.directive.ts b/libs/template/for/src/lib/for.directive.ts
@@ -13,14 +13,17 @@ import {
   OnInit,
   TemplateRef,
   TrackByFunction,
-  ViewContainerRef
+  ViewContainerRef,
 } from '@angular/core';
-import { coerceDistinctWith, coerceObservableWith } from '@rx-angular/cdk/coercing';
+import {
+  coerceDistinctWith,
+  coerceObservableWith,
+} from '@rx-angular/cdk/coercing';
 import { RxStrategyProvider } from '@rx-angular/cdk/render-strategies';
 import {
   createListTemplateManager,
   RxListManager,
-  RxListViewComputedContext
+  RxListViewComputedContext,
 } from '@rx-angular/cdk/template';
 
 import {
@@ -29,8 +32,8 @@ import {
   ReplaySubject,
   Subject,
   Subscription,
-  switchAll
 } from 'rxjs';
+import { switchAll } from 'rxjs/operators';
 import { RxForViewContext } from './for-view-context';
 
 /**
diff --git a/libs/template/let/src/lib/let.directive.ts b/libs/template/let/src/lib/let.directive.ts
@@ -32,7 +32,6 @@ import {
 
 import {
   defer,
-  map,
   merge,
   NEVER,
   NextObserver,
@@ -41,8 +40,8 @@ import {
   ReplaySubject,
   Subject,
   Subscription,
-  filter,
 } from 'rxjs';
+import { map, filter } from 'rxjs/operators';
 
 /** @internal */
 type RxLetTemplateNames = 'nextTpl' | RxBaseTemplateNames;
diff --git a/libs/template/push/src/lib/push.pipe.ts b/libs/template/push/src/lib/push.pipe.ts
@@ -21,12 +21,12 @@ import {
   Observable,
   ObservableInput,
   OperatorFunction,
-  shareReplay,
-  skip,
   Subscription,
   Unsubscribable,
 } from 'rxjs';
 import {
+  shareReplay,
+  skip,
   filter,
   switchMap,
   tap,

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ import { isObservable, Observable, ObservableInput, of } from 'rxjs';`
`5`	`5`	`*`
`6`	`6`	`* @param o - the value to coerce`
`7`	`7`	`*/`
`8`		`-export function coerceObservable<T>(`
`9`		`- o: ObservableInput<T> \| T`
`10`		`-): Observable<T> {`
	`8`	`+export function coerceObservable<T>(o: ObservableInput<T> \| T): Observable<T> {`
`11`	`9`	`return isObservable(o) ? o : of(o as T);`
`12`	`10`	`}`