refactor(rxjs): remove lettable operators

Splaktar · Splaktar · commit 9181d45aceff · 2018-01-03T14:21:10.000-05:00
diff --git a/src/app/agents/leads/free/free.component.ts b/src/app/agents/leads/free/free.component.ts
@@ -1,8 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {NavService} from '../../../nav.service';
 import {UsersService} from '../../../users.service';
-import {of} from 'rxjs/observable/of';
-import {take} from 'rxjs/operators';
+import {Observable} from 'rxjs/Observable';
 
 @Component({
   selector: 'app-free',
@@ -20,10 +19,7 @@ export class FreeComponent implements OnInit {
 
   ngOnInit() {
     // Just adding in some operators since they were all removed from this lazy loaded module when making a public example
-    of([])
-    .pipe(
-      take(1)
-    )
+    Observable.of([]).take(1)
     .subscribe(data => this.data = data);
   }
 }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -5,7 +5,6 @@ import {environment} from '../environments/environment';
 import {NavService} from './nav.service';
 import {GoogleAnalyticsService} from './google-analytics.service';
 import {isPlatformBrowser} from '@angular/common';
-import {filter} from 'rxjs/operators';
 
 @Component({
   selector: 'app-root',
@@ -41,10 +40,7 @@ export class AppComponent implements OnInit, AfterViewInit {
       };
 
       // scrollTop on newly visited pages
-      this.router.events
-      .pipe(
-        filter(event => event instanceof NavigationEnd)
-      )
+      this.router.events.filter(event => event instanceof NavigationEnd)
       .subscribe(() => {
         if (this.firstUseOfCurrentRoute) {
           const scrollingElement = document.scrollingElement || document.documentElement;
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -11,6 +11,7 @@ import 'hammerjs';
 import {
   MatAutocompleteModule, MatMenuModule, MatSidenavModule, MatSnackBarModule, MatToolbarModule
 } from '@angular/material';
+import './rxjs.extensions';
 
 import {AppRoutingModule} from './app-routing.module';
 import {SharedModule} from './shared';
diff --git a/src/app/rxjs.extensions.ts b/src/app/rxjs.extensions.ts
@@ -0,0 +1,12 @@
+// Purposely importing more than I actually need here to test tree shaking
+// Just of, take, and filter are used atm.
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/debounceTime';
+import 'rxjs/add/operator/distinctUntilChanged';
+import 'rxjs/add/operator/filter';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/mergeMap';
+import 'rxjs/add/operator/switchMap';
+import 'rxjs/add/operator/take';
+import 'rxjs/add/observable/of';
+import 'rxjs/add/observable/throw';
diff --git a/src/test.ts b/src/test.ts
@@ -11,6 +11,7 @@ import {
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
+import './app/rxjs.extensions';
 
 // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
 declare var __karma__: any;
