Removed unnecessary share replays

src/assets/javascripts/components/_/index.ts

@@ -137,7 +137,7 @@ export function setupComponents(
       }),
 
       /* Convert to hot observable */
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 }
 

src/assets/javascripts/components/header/_/index.ts

@@ -25,7 +25,6 @@ import {
   distinctUntilChanged,
   filter,
   map,
-  shareReplay,
   startWith,
   switchMap,
   withLatestFrom
@@ -116,8 +115,7 @@ export function mountHeader(
       /* Combine into single observable */
       return combineLatest([header$, type$])
         .pipe(
-          map(([header, type]): Header => ({ type, ...header })),
-          shareReplay(1)
+          map(([header, type]): Header => ({ type, ...header }))
         )
     })
   )

src/assets/javascripts/components/header/react/index.ts

@@ -96,7 +96,7 @@ export function watchHeader(
           })
         }
       }),
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 }
 

src/assets/javascripts/components/main/react/index.ts

@@ -34,7 +34,6 @@ import {
   map,
   observeOn,
   pluck,
-  shareReplay,
   switchMap,
   tap
 } from "rxjs/operators"
@@ -84,8 +83,7 @@ export function watchMain(
   const adjust$ = header$
     .pipe(
       pluck("height"),
-      distinctUntilChanged(),
-      shareReplay(1)
+      distinctUntilChanged()
     )
 
   /* Compute the main area's top and bottom borders */
@@ -96,11 +94,10 @@ export function watchMain(
           map(({ height }) => ({
             top:    el.offsetTop,
             bottom: el.offsetTop + height
-          }))
+          })),
+          distinctUntilKeyChanged("bottom")
         )
-      ),
-      distinctUntilKeyChanged("bottom"),
-      shareReplay(1)
+      )
     )
 
   /* Compute the main area's offset, visible height and if we scrolled past */

src/assets/javascripts/components/navigation/_/index.ts

@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2016-2020 Martin Donath <martin.donath@squidfunk.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-import { Observable, OperatorFunction, of, pipe } from "rxjs"
-import { map, switchMap } from "rxjs/operators"
-
-import { Viewport } from "browser"
-
-import { Header } from "../../header"
-import { Main } from "../../main"
-import {
-  Sidebar,
-  applySidebar,
-  watchSidebar
-} from "../../shared"
-
-/* ----------------------------------------------------------------------------
- * Types
- * ------------------------------------------------------------------------- */
-
-/**
- * Navigation for [screen -]
- */
-interface NavigationBelowScreen {} // tslint:disable-line
-
-/**
- * Navigation for [screen +]
- */
-interface NavigationAboveScreen {
-  sidebar: Sidebar                     /* Sidebar */
-}
-
-/* ------------------------------------------------------------------------- */
-
-/**
- * Navigation
- */
-export type Navigation =
-  | NavigationBelowScreen
-  | NavigationAboveScreen
-
-/* ----------------------------------------------------------------------------
- * Helper types
- * ------------------------------------------------------------------------- */
-
-/**
- * Mount options
- */
-interface MountOptions {
-  header$: Observable<Header>          /* Header observable */
-  main$: Observable<Main>              /* Main area observable */
-  viewport$: Observable<Viewport>      /* Viewport observable */
-  screen$: Observable<boolean>         /* Screen media observable */
-}
-
-/* ----------------------------------------------------------------------------
- * Functions
- * ------------------------------------------------------------------------- */
-
-/**
- * Mount navigation from source observable
- *
- * @param options - Options
- *
- * @return Operator function
- */
-export function mountNavigation(
-  { header$, main$, viewport$, screen$ }: MountOptions
-): OperatorFunction<HTMLElement, Navigation> {
-  return pipe(
-    switchMap(el => screen$
-      .pipe(
-        switchMap(screen => {
-
-          /* [screen +]: Mount navigation in sidebar */
-          if (screen) {
-            return watchSidebar(el, { main$, viewport$ })
-              .pipe(
-                applySidebar(el, { header$ }),
-                map(sidebar => ({ sidebar }))
-              )
-
-          /* [screen -]: Mount navigation in drawer */
-          } else {
-            return of({})
-          }
-        })
-      )
-    )
-  )
-}

src/assets/javascripts/components/navigation/index.ts

@@ -20,4 +20,91 @@
  * IN THE SOFTWARE.
  */
 
-export * from "./_"
+import { Observable, OperatorFunction, of, pipe } from "rxjs"
+import { map, switchMap } from "rxjs/operators"
+
+import { Viewport } from "browser"
+
+import { Header } from "../header"
+import { Main } from "../main"
+import {
+  Sidebar,
+  applySidebar,
+  watchSidebar
+} from "../shared"
+
+/* ----------------------------------------------------------------------------
+ * Types
+ * ------------------------------------------------------------------------- */
+
+/**
+ * Navigation for [screen -]
+ */
+interface NavigationBelowScreen {} // tslint:disable-line
+
+/**
+ * Navigation for [screen +]
+ */
+interface NavigationAboveScreen {
+  sidebar: Sidebar                     /* Sidebar */
+}
+
+/* ------------------------------------------------------------------------- */
+
+/**
+ * Navigation
+ */
+export type Navigation =
+  | NavigationBelowScreen
+  | NavigationAboveScreen
+
+/* ----------------------------------------------------------------------------
+ * Helper types
+ * ------------------------------------------------------------------------- */
+
+/**
+ * Mount options
+ */
+interface MountOptions {
+  header$: Observable<Header>          /* Header observable */
+  main$: Observable<Main>              /* Main area observable */
+  viewport$: Observable<Viewport>      /* Viewport observable */
+  screen$: Observable<boolean>         /* Screen media observable */
+}
+
+/* ----------------------------------------------------------------------------
+ * Functions
+ * ------------------------------------------------------------------------- */
+
+/**
+ * Mount navigation from source observable
+ *
+ * @param options - Options
+ *
+ * @return Operator function
+ */
+export function mountNavigation(
+  { header$, main$, viewport$, screen$ }: MountOptions
+): OperatorFunction<HTMLElement, Navigation> {
+  return pipe(
+    switchMap(el => screen$
+      .pipe(
+        switchMap(screen => {
+
+          /* [screen +]: Mount navigation in sidebar */
+          if (screen) {
+            return watchSidebar(el, { main$, viewport$ })
+              .pipe(
+                applySidebar(el, { header$ }),
+                map(sidebar => ({ sidebar }))
+              )
+
+          /* [screen -]: Mount navigation in drawer */
+          } else {
+            return of({})
+          }
+        })
+      )
+    )
+  )
+}

src/assets/javascripts/index.ts

@@ -200,13 +200,13 @@ export function initialize(config: unknown) {
   const header$ = useComponent("header")
     .pipe(
       mountHeader({ document$, viewport$ }),
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 
   const main$ = useComponent("main")
     .pipe(
       mountMain({ header$, viewport$ }),
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 
   /* ----------------------------------------------------------------------- */
@@ -214,25 +214,25 @@ export function initialize(config: unknown) {
   const navigation$ = useComponent("navigation")
     .pipe(
       mountNavigation({ header$, main$, viewport$, screen$ }),
-      shareReplay(1) // shareReplay because there might be late subscribers
+      shareReplay({ bufferSize: 1, refCount: true }) // shareReplay because there might be late subscribers
     )
 
   const toc$ = useComponent("toc")
     .pipe(
       mountTableOfContents({ header$, main$, viewport$, tablet$ }),
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 
   const tabs$ = useComponent("tabs")
     .pipe(
       mountTabs({ header$, viewport$, screen$ }),
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 
   const hero$ = useComponent("hero")
     .pipe(
       mountHero({ header$, viewport$ }),
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 
   /* ----------------------------------------------------------------------- */
@@ -277,21 +277,21 @@ export function initialize(config: unknown) {
         const query$ = useComponent("search-query")
           .pipe(
             mountSearchQuery(worker, { transform: config.search.transform }),
-            shareReplay(1)
+            shareReplay({ bufferSize: 1, refCount: true })
           )
 
         /* Mount search reset */
         const reset$ = useComponent("search-reset")
           .pipe(
             mountSearchReset(),
-            shareReplay(1)
+            shareReplay({ bufferSize: 1, refCount: true })
           )
 
         /* Mount search result */
         const result$ = useComponent("search-result")
           .pipe(
             mountSearchResult(worker, { query$ }),
-            shareReplay(1)
+            shareReplay({ bufferSize: 1, refCount: true })
           )
 
         return useComponent("search")
@@ -304,7 +304,7 @@ export function initialize(config: unknown) {
           .subscribe(el => el.hidden = true) // TODO: Hack
         return NEVER
       }),
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 
   /* ----------------------------------------------------------------------- */

src/assets/javascripts/integrations/search/worker/_/index.ts

@@ -25,7 +25,7 @@ import { Observable, Subject, asyncScheduler } from "rxjs"
 import {
   map,
   observeOn,
-  shareReplay,
+  share,
   withLatestFrom
 } from "rxjs/operators"
 
@@ -120,7 +120,7 @@ export function setupSearchWorker(
         }
         return message
       }),
-      shareReplay(1)
+      share()
     )
 
   /* Set up search index */

src/assets/javascripts/patches/scrollfix/index.ts

@@ -70,7 +70,7 @@ export function patchScrollfix(
   const els$ = document$
     .pipe(
       map(() => getElements("[data-md-scrollfix]")),
-      shareReplay(1)
+      shareReplay({ bufferSize: 1, refCount: true })
     )
 
   /* Remove marker attribute, so we'll only add the fix once */

src/assets/javascripts/patches/source/github/index.ts

@@ -21,9 +21,9 @@
  */
 
 import { Repo, User } from "github-types"
-import { Observable, of } from "rxjs"
+import { Observable } from "rxjs"
 import { ajax } from "rxjs/ajax"
-import { filter, pluck, switchMap } from "rxjs/operators"
+import { filter, map, pluck } from "rxjs/operators"
 
 import { round } from "utilities"
 
@@ -53,22 +53,22 @@ export function fetchSourceFactsFromGitHub(
     .pipe(
       filter(({ status }) => status === 200),
       pluck("response"),
-      switchMap(data => {
+      map(data => {
 
         /* GitHub repository */
         if (typeof repo !== "undefined") {
           const { stargazers_count, forks_count }: Repo = data
-          return of([
+          return [
             `${round(stargazers_count || 0)} Stars`,
             `${round(forks_count || 0)} Forks`
-          ])
+          ]
 
         /* GitHub user/organization */
         } else {
           const { public_repos }: User = data
-          return of([
+          return [
             `${round(public_repos || 0)} Repositories`
-          ])
+          ]
         }
       })
     )