diff --git a/README.md b/README.md
index 24de33ab0b..d113a04bdf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# RxJS: Reactive Extensions For JavaScript
+# RxJS: Reactive Extensions For JavaScript
![CI](https://github.com/reactivex/rxjs/workflows/CI/badge.svg)
[![npm version](https://badge.fury.io/js/rxjs.svg)](http://badge.fury.io/js/rxjs)
diff --git a/docs_app/assets/Rx_Logo_S.png b/docs_app/assets/Rx_Logo_S.png
deleted file mode 100644
index 752fac1e2d..0000000000
Binary files a/docs_app/assets/Rx_Logo_S.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/audit.png b/docs_app/assets/images/marble-diagrams/audit.png
deleted file mode 100644
index ceca809ff0..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/audit.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/audit.svg b/docs_app/assets/images/marble-diagrams/audit.svg
deleted file mode 100644
index 2c510189d6..0000000000
--- a/docs_app/assets/images/marble-diagrams/audit.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/docs_app/assets/images/marble-diagrams/auditTime.png b/docs_app/assets/images/marble-diagrams/auditTime.png
deleted file mode 100644
index a259f2bcc9..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/auditTime.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/buffer.png b/docs_app/assets/images/marble-diagrams/buffer.png
deleted file mode 100644
index ccc9c33e35..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/buffer.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/bufferCount.png b/docs_app/assets/images/marble-diagrams/bufferCount.png
deleted file mode 100644
index 36afdf75b7..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/bufferCount.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/bufferTime.png b/docs_app/assets/images/marble-diagrams/bufferTime.png
deleted file mode 100644
index ae8c9dfc22..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/bufferTime.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/bufferToggle.png b/docs_app/assets/images/marble-diagrams/bufferToggle.png
deleted file mode 100644
index 7257358745..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/bufferToggle.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/bufferWhen.png b/docs_app/assets/images/marble-diagrams/bufferWhen.png
deleted file mode 100644
index 6165954d4d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/bufferWhen.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/catch.png b/docs_app/assets/images/marble-diagrams/catch.png
deleted file mode 100644
index f47e4f8e10..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/catch.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/combineAll.png b/docs_app/assets/images/marble-diagrams/combineAll.png
deleted file mode 100644
index d9d240f183..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/combineAll.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/combineLatest.png b/docs_app/assets/images/marble-diagrams/combineLatest.png
deleted file mode 100644
index 528041fd86..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/combineLatest.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/concat.png b/docs_app/assets/images/marble-diagrams/concat.png
deleted file mode 100644
index dce8453f04..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/concat.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/concatAll.png b/docs_app/assets/images/marble-diagrams/concatAll.png
deleted file mode 100644
index 687cdfa728..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/concatAll.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/concatAll.svg b/docs_app/assets/images/marble-diagrams/concatAll.svg
deleted file mode 100755
index f7a5258ab7..0000000000
--- a/docs_app/assets/images/marble-diagrams/concatAll.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/docs_app/assets/images/marble-diagrams/concatMap.png b/docs_app/assets/images/marble-diagrams/concatMap.png
deleted file mode 100644
index 38dfa20821..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/concatMap.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/concatMapTo.png b/docs_app/assets/images/marble-diagrams/concatMapTo.png
deleted file mode 100644
index 10f60435e3..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/concatMapTo.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/count.png b/docs_app/assets/images/marble-diagrams/count.png
deleted file mode 100644
index 0cf88b2ebd..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/count.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/debounce.png b/docs_app/assets/images/marble-diagrams/debounce.png
deleted file mode 100644
index 91ed9bb1cf..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/debounce.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/debounce.svg b/docs_app/assets/images/marble-diagrams/debounce.svg
deleted file mode 100644
index 689f7ef820..0000000000
--- a/docs_app/assets/images/marble-diagrams/debounce.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/docs_app/assets/images/marble-diagrams/debounceTime.png b/docs_app/assets/images/marble-diagrams/debounceTime.png
deleted file mode 100644
index c3e9efa633..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/debounceTime.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/defaultIfEmpty.png b/docs_app/assets/images/marble-diagrams/defaultIfEmpty.png
deleted file mode 100644
index c76ccce12f..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/defaultIfEmpty.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/defer.png b/docs_app/assets/images/marble-diagrams/defer.png
deleted file mode 100644
index 3eea61346d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/defer.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/delay.png b/docs_app/assets/images/marble-diagrams/delay.png
deleted file mode 100644
index 4f296f32c0..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/delay.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/delayWhen.png b/docs_app/assets/images/marble-diagrams/delayWhen.png
deleted file mode 100644
index c766728d64..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/delayWhen.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/dematerialize.png b/docs_app/assets/images/marble-diagrams/dematerialize.png
deleted file mode 100644
index 0799abeb52..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/dematerialize.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/elementAt.png b/docs_app/assets/images/marble-diagrams/elementAt.png
deleted file mode 100644
index 3cd67518a6..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/elementAt.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/empty.png b/docs_app/assets/images/marble-diagrams/empty.png
deleted file mode 100644
index e2928ddb59..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/empty.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/endWith.png b/docs_app/assets/images/marble-diagrams/endWith.png
deleted file mode 100644
index 54c983eb47..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/endWith.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/every.png b/docs_app/assets/images/marble-diagrams/every.png
deleted file mode 100644
index 63bcebc60c..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/every.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/exhaust.png b/docs_app/assets/images/marble-diagrams/exhaust.png
deleted file mode 100644
index bd193bc950..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/exhaust.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/exhaustMap.png b/docs_app/assets/images/marble-diagrams/exhaustMap.png
deleted file mode 100644
index df128b4d1c..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/exhaustMap.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/expand.png b/docs_app/assets/images/marble-diagrams/expand.png
deleted file mode 100644
index 0f97e282f5..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/expand.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/filter.png b/docs_app/assets/images/marble-diagrams/filter.png
deleted file mode 100644
index 7dabb61267..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/filter.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/find.png b/docs_app/assets/images/marble-diagrams/find.png
deleted file mode 100644
index 343b826190..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/find.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/findIndex.png b/docs_app/assets/images/marble-diagrams/findIndex.png
deleted file mode 100644
index abf1d2a029..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/findIndex.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/first.png b/docs_app/assets/images/marble-diagrams/first.png
deleted file mode 100644
index 0fc0625b25..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/first.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/forkJoin.png b/docs_app/assets/images/marble-diagrams/forkJoin.png
deleted file mode 100644
index 913993717d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/forkJoin.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/from.png b/docs_app/assets/images/marble-diagrams/from.png
deleted file mode 100644
index ab7d00cd78..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/from.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/fromEvent.png b/docs_app/assets/images/marble-diagrams/fromEvent.png
deleted file mode 100644
index 452280f9ef..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/fromEvent.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/fromEventPattern.png b/docs_app/assets/images/marble-diagrams/fromEventPattern.png
deleted file mode 100644
index 3e9d4d77d2..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/fromEventPattern.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/generate.png b/docs_app/assets/images/marble-diagrams/generate.png
deleted file mode 100644
index 10b9a34a19..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/generate.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/groupBy.png b/docs_app/assets/images/marble-diagrams/groupBy.png
deleted file mode 100644
index 29b80110df..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/groupBy.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/ignoreElements.png b/docs_app/assets/images/marble-diagrams/ignoreElements.png
deleted file mode 100644
index 6dcb3a21b4..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/ignoreElements.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/interval.png b/docs_app/assets/images/marble-diagrams/interval.png
deleted file mode 100644
index e7bbe99b5f..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/interval.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/isEmpty.png b/docs_app/assets/images/marble-diagrams/isEmpty.png
deleted file mode 100644
index e3154db7f7..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/isEmpty.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/last.png b/docs_app/assets/images/marble-diagrams/last.png
deleted file mode 100644
index e2078e3262..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/last.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/map.png b/docs_app/assets/images/marble-diagrams/map.png
deleted file mode 100644
index c08038065e..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/map.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/mapTo.png b/docs_app/assets/images/marble-diagrams/mapTo.png
deleted file mode 100644
index 4f47644cf1..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/mapTo.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/materialize.png b/docs_app/assets/images/marble-diagrams/materialize.png
deleted file mode 100644
index c8a71319a9..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/materialize.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/max.png b/docs_app/assets/images/marble-diagrams/max.png
deleted file mode 100644
index 017f6c7200..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/max.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/merge.png b/docs_app/assets/images/marble-diagrams/merge.png
deleted file mode 100644
index 4785ecb253..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/merge.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/mergeAll.png b/docs_app/assets/images/marble-diagrams/mergeAll.png
deleted file mode 100644
index 12c4be9ea3..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/mergeAll.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/mergeMap.png b/docs_app/assets/images/marble-diagrams/mergeMap.png
deleted file mode 100644
index 730b5f07db..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/mergeMap.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/mergeMapTo.png b/docs_app/assets/images/marble-diagrams/mergeMapTo.png
deleted file mode 100644
index 5fbac90eac..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/mergeMapTo.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/min.png b/docs_app/assets/images/marble-diagrams/min.png
deleted file mode 100644
index 53a4d05b87..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/min.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/multicast.png b/docs_app/assets/images/marble-diagrams/multicast.png
deleted file mode 100644
index 9b8fce695f..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/multicast.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/never.png b/docs_app/assets/images/marble-diagrams/never.png
deleted file mode 100644
index 96300cab53..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/never.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/of.png b/docs_app/assets/images/marble-diagrams/of.png
deleted file mode 100644
index 2013dcaf7d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/of.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/onErrorResumeNext.png b/docs_app/assets/images/marble-diagrams/onErrorResumeNext.png
deleted file mode 100644
index 878fac849d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/onErrorResumeNext.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/pairs.png b/docs_app/assets/images/marble-diagrams/pairs.png
deleted file mode 100644
index 4a514e0cd3..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/pairs.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/pairwise.png b/docs_app/assets/images/marble-diagrams/pairwise.png
deleted file mode 100644
index 4d32f71998..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/pairwise.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/partition.png b/docs_app/assets/images/marble-diagrams/partition.png
deleted file mode 100644
index ffd3b6b525..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/partition.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/pluck.png b/docs_app/assets/images/marble-diagrams/pluck.png
deleted file mode 100644
index 9ddfcbe5ea..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/pluck.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/publish.png b/docs_app/assets/images/marble-diagrams/publish.png
deleted file mode 100644
index 0834f221bb..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/publish.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/publishLast.png b/docs_app/assets/images/marble-diagrams/publishLast.png
deleted file mode 100644
index 854cd36c3d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/publishLast.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/race.png b/docs_app/assets/images/marble-diagrams/race.png
deleted file mode 100644
index 84dcf0c90a..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/race.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/range.png b/docs_app/assets/images/marble-diagrams/range.png
deleted file mode 100644
index 17dbd736c3..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/range.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/reduce.png b/docs_app/assets/images/marble-diagrams/reduce.png
deleted file mode 100644
index 3988fafdd2..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/reduce.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/refCount.png b/docs_app/assets/images/marble-diagrams/refCount.png
deleted file mode 100644
index 57b0328a10..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/refCount.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/repeat.png b/docs_app/assets/images/marble-diagrams/repeat.png
deleted file mode 100644
index 9ef4598b7d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/repeat.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/repeatWhen.png b/docs_app/assets/images/marble-diagrams/repeatWhen.png
deleted file mode 100644
index 33f84a3ba6..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/repeatWhen.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/retry.png b/docs_app/assets/images/marble-diagrams/retry.png
deleted file mode 100644
index 7a44168b27..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/retry.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/retryWhen.png b/docs_app/assets/images/marble-diagrams/retryWhen.png
deleted file mode 100644
index a886f19f84..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/retryWhen.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/sample.png b/docs_app/assets/images/marble-diagrams/sample.png
deleted file mode 100644
index f5da6f0801..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/sample.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/sampleTime.png b/docs_app/assets/images/marble-diagrams/sampleTime.png
deleted file mode 100644
index f6e7f62466..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/sampleTime.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/scan.png b/docs_app/assets/images/marble-diagrams/scan.png
deleted file mode 100644
index dd361b38f7..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/scan.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/sequenceEqual.png b/docs_app/assets/images/marble-diagrams/sequenceEqual.png
deleted file mode 100644
index f0b648de19..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/sequenceEqual.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/share.png b/docs_app/assets/images/marble-diagrams/share.png
deleted file mode 100644
index a73805d8d3..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/share.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/single.png b/docs_app/assets/images/marble-diagrams/single.png
deleted file mode 100644
index f6a28d2e9c..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/single.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/skip.png b/docs_app/assets/images/marble-diagrams/skip.png
deleted file mode 100644
index 855b81d897..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/skip.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/skipLast.png b/docs_app/assets/images/marble-diagrams/skipLast.png
deleted file mode 100644
index 8c98d68cd4..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/skipLast.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/skipUntil.png b/docs_app/assets/images/marble-diagrams/skipUntil.png
deleted file mode 100644
index c782223d97..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/skipUntil.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/skipWhile.png b/docs_app/assets/images/marble-diagrams/skipWhile.png
deleted file mode 100644
index e740672ec7..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/skipWhile.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/startWith.png b/docs_app/assets/images/marble-diagrams/startWith.png
deleted file mode 100644
index de31f98bce..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/startWith.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/subscribeOn.png b/docs_app/assets/images/marble-diagrams/subscribeOn.png
deleted file mode 100644
index 618e7a77f5..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/subscribeOn.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/switchAll.png b/docs_app/assets/images/marble-diagrams/switchAll.png
deleted file mode 100644
index ed3223a173..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/switchAll.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/switchMap.png b/docs_app/assets/images/marble-diagrams/switchMap.png
deleted file mode 100644
index 721b30bd9e..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/switchMap.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/switchMapTo.png b/docs_app/assets/images/marble-diagrams/switchMapTo.png
deleted file mode 100644
index f255242789..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/switchMapTo.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/take.png b/docs_app/assets/images/marble-diagrams/take.png
deleted file mode 100644
index 8ef188dcdf..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/take.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/takeLast.png b/docs_app/assets/images/marble-diagrams/takeLast.png
deleted file mode 100644
index a92c41be75..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/takeLast.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/takeUntil.png b/docs_app/assets/images/marble-diagrams/takeUntil.png
deleted file mode 100644
index eba960e63d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/takeUntil.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/takeWhile.png b/docs_app/assets/images/marble-diagrams/takeWhile.png
deleted file mode 100644
index 2e1e1830bf..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/takeWhile.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/tap.png b/docs_app/assets/images/marble-diagrams/tap.png
deleted file mode 100644
index 1ea11d3d32..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/tap.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/throttle.png b/docs_app/assets/images/marble-diagrams/throttle.png
deleted file mode 100644
index 18a69a0697..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/throttle.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/throttle.svg b/docs_app/assets/images/marble-diagrams/throttle.svg
deleted file mode 100644
index ee250face1..0000000000
--- a/docs_app/assets/images/marble-diagrams/throttle.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/docs_app/assets/images/marble-diagrams/throttleTime.png b/docs_app/assets/images/marble-diagrams/throttleTime.png
deleted file mode 100644
index 23954c5a06..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/throttleTime.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/throw.png b/docs_app/assets/images/marble-diagrams/throw.png
deleted file mode 100644
index befdd36961..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/throw.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/throwIfEmpty.png b/docs_app/assets/images/marble-diagrams/throwIfEmpty.png
deleted file mode 100644
index a463ec0af7..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/throwIfEmpty.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/timeinterval.png b/docs_app/assets/images/marble-diagrams/timeinterval.png
deleted file mode 100644
index 4f24523525..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/timeinterval.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/timeout.png b/docs_app/assets/images/marble-diagrams/timeout.png
deleted file mode 100644
index 8b1d99c483..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/timeout.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/timeoutWith.png b/docs_app/assets/images/marble-diagrams/timeoutWith.png
deleted file mode 100644
index 1fee9b9341..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/timeoutWith.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/timer.png b/docs_app/assets/images/marble-diagrams/timer.png
deleted file mode 100644
index 2299f1c285..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/timer.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/timestamp.png b/docs_app/assets/images/marble-diagrams/timestamp.png
deleted file mode 100644
index f2895b4305..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/timestamp.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/toArray.png b/docs_app/assets/images/marble-diagrams/toArray.png
deleted file mode 100644
index 0c8cb4e128..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/toArray.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/window.png b/docs_app/assets/images/marble-diagrams/window.png
deleted file mode 100644
index 1fbe7c963d..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/window.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/windowCount.png b/docs_app/assets/images/marble-diagrams/windowCount.png
deleted file mode 100644
index 6ebbaada90..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/windowCount.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/windowTime.png b/docs_app/assets/images/marble-diagrams/windowTime.png
deleted file mode 100644
index 7c3adcb948..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/windowTime.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/windowToggle.png b/docs_app/assets/images/marble-diagrams/windowToggle.png
deleted file mode 100644
index 4d8489513c..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/windowToggle.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/windowWhen.png b/docs_app/assets/images/marble-diagrams/windowWhen.png
deleted file mode 100644
index 0d3f93812a..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/windowWhen.png and /dev/null differ
diff --git a/docs_app/assets/images/marble-diagrams/withLatestFrom.png b/docs_app/assets/images/marble-diagrams/withLatestFrom.png
deleted file mode 100644
index 499cacbaff..0000000000
Binary files a/docs_app/assets/images/marble-diagrams/withLatestFrom.png and /dev/null differ
diff --git a/docs_app/package.json b/docs_app/package.json
index 87d09082f4..b5b72cb8de 100644
--- a/docs_app/package.json
+++ b/docs_app/package.json
@@ -116,7 +116,6 @@
"lighthouse": "^7.0.1",
"lodash": "^4.17.20",
"lunr": "^2.1.0",
- "mkdirp": "^0.5.1",
"protractor": "~7.0.0",
"rehype-slug": "^2.0.3",
"remark": "^12.0.1",
diff --git a/docs_app/src/assets/images/marble-diagrams/audit.png b/docs_app/src/assets/images/marble-diagrams/audit.png
deleted file mode 100644
index ceca809ff0..0000000000
Binary files a/docs_app/src/assets/images/marble-diagrams/audit.png and /dev/null differ
diff --git a/docs_app/src/assets/images/marble-diagrams/debounce.png b/docs_app/src/assets/images/marble-diagrams/debounce.png
deleted file mode 100644
index 91ed9bb1cf..0000000000
Binary files a/docs_app/src/assets/images/marble-diagrams/debounce.png and /dev/null differ
diff --git a/docs_app/src/assets/images/marble-diagrams/throttle.png b/docs_app/src/assets/images/marble-diagrams/throttle.png
deleted file mode 100644
index 18a69a0697..0000000000
Binary files a/docs_app/src/assets/images/marble-diagrams/throttle.png and /dev/null differ
diff --git a/docs_app/tools/transforms/angular-api-package/index.js b/docs_app/tools/transforms/angular-api-package/index.js
index 5217bb65c7..2cda9a5ba5 100644
--- a/docs_app/tools/transforms/angular-api-package/index.js
+++ b/docs_app/tools/transforms/angular-api-package/index.js
@@ -10,7 +10,7 @@ const Package = require('dgeni').Package;
const basePackage = require('../angular-base-package');
const typeScriptPackage = require('dgeni-packages/typescript');
const { API_SOURCE_PATH, API_TEMPLATES_PATH, MARBLE_IMAGES_PATH, MARBLE_IMAGES_WEB_PATH,
- MARBLE_IMAGES_OUTPUT_PATH, requireFolder } = require('../config');
+ requireFolder } = require('../config');
module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
@@ -188,15 +188,13 @@ module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
.config(function(embedMarbleDiagramsPostProcessor) {
embedMarbleDiagramsPostProcessor.marbleImagesPath = MARBLE_IMAGES_PATH;
- embedMarbleDiagramsPostProcessor.marbleImagesOutputPath = MARBLE_IMAGES_OUTPUT_PATH;
embedMarbleDiagramsPostProcessor.marbleImagesOutputWebPath = `/${MARBLE_IMAGES_WEB_PATH}`;
})
.config(function(convertToJsonProcessor, postProcessHtml, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES, autoLinkCode, embedMarbleDiagramsPostProcessor) {
convertToJsonProcessor.docTypes = convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
postProcessHtml.docTypes = convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
- postProcessHtml.plugins = [embedMarbleDiagramsPostProcessor.process];
+ postProcessHtml.plugins.push(embedMarbleDiagramsPostProcessor.process);
autoLinkCode.docTypes = API_DOC_TYPES;
autoLinkCode.codeElements = ['code', 'code-example', 'code-pane'];
});
-
diff --git a/docs_app/tools/transforms/angular-api-package/post-processors/embedMarbleDiagrams.js b/docs_app/tools/transforms/angular-api-package/post-processors/embedMarbleDiagrams.js
index 7309502f33..266a762432 100644
--- a/docs_app/tools/transforms/angular-api-package/post-processors/embedMarbleDiagrams.js
+++ b/docs_app/tools/transforms/angular-api-package/post-processors/embedMarbleDiagrams.js
@@ -1,17 +1,14 @@
const fs = require('fs');
const path = require('path');
-const mkdirp = require('mkdirp');
const visit = require('unist-util-visit');
const is = require('hast-util-is-element');
/**
* Find pre-rendered marble diagrams and override their `src` attributes in docs.
- * You need to run `npm run tests2png` in rxjs root to generate marble diagrams into `tmp/docs/img`
*/
-module.exports = function embedMarbleDiagramsPostProcessor(log) {
+module.exports = function embedMarbleDiagramsPostProcessor() {
const service = {
marbleImagesPath: null,
- marbleImagesOutputPath: null,
marbleImagesOutputWebPath: null,
process: () => {
return (tree) => {
@@ -23,18 +20,12 @@ module.exports = function embedMarbleDiagramsPostProcessor(log) {
if (fs.existsSync(expectedImgPath)) {
const operator = path.basename(src, path.extname(src));
const filename = path.basename(expectedImgPath);
- const targetPath = `${service.marbleImagesOutputPath}/${filename}`;
-
- mkdirp.sync(path.dirname(targetPath));
- fs.copyFileSync(expectedImgPath, targetPath);
props.src = `${service.marbleImagesOutputWebPath}/${filename}`;
props.width = '100%';
if (!props.alt) {
props.alt = `${operator} marble diagram`;
}
-
- log.debug(`Found ${expectedImgPath} and copying it to ${targetPath}`);
}
}
});
diff --git a/docs_app/tools/transforms/angular-base-package/index.js b/docs_app/tools/transforms/angular-base-package/index.js
index 85be858697..f42fff00c7 100644
--- a/docs_app/tools/transforms/angular-base-package/index.js
+++ b/docs_app/tools/transforms/angular-base-package/index.js
@@ -137,7 +137,7 @@ module.exports = new Package('angular-base', [
postProcessHtml.plugins = [
require('./post-processors/autolink-headings'),
addImageDimensions,
- require('./post-processors/h1-checker'),
+ // require('./post-processors/h1-checker'),
autoLinkCode,
];
})
diff --git a/docs_app/tools/transforms/angular-base-package/post-processors/auto-link-code.js b/docs_app/tools/transforms/angular-base-package/post-processors/auto-link-code.js
index 558a5705cb..18493f78da 100644
--- a/docs_app/tools/transforms/angular-base-package/post-processors/auto-link-code.js
+++ b/docs_app/tools/transforms/angular-base-package/post-processors/auto-link-code.js
@@ -24,56 +24,126 @@ module.exports = function autoLinkCode(getDocFromAlias) {
autoLinkCodeImpl.docTypes = [];
autoLinkCodeImpl.customFilters = [];
autoLinkCodeImpl.codeElements = ['code'];
+ autoLinkCodeImpl.ignoredLanguages = ['bash', 'sh', 'shell', 'json', 'markdown'];
+ autoLinkCodeImpl.failOnMissingDocPath = false;
+
return autoLinkCodeImpl;
- function autoLinkCodeImpl() {
- return (ast) => {
+ function autoLinkCodeImpl() {
+ return (ast, file) => {
visit(ast, 'element', (node, ancestors) => {
- // Only interested in code elements that are not inside links
- if (autoLinkCodeImpl.codeElements.some(elementType => is(node, elementType)) &&
- ancestors.every(ancestor => !is(ancestor, 'a'))) {
- visit(node, 'text', (node, ancestors) => {
- // Only interested in text nodes that are not inside links
- if (ancestors.every(ancestor => !is(ancestor, 'a'))) {
-
- const parent = ancestors[ancestors.length-1];
- const index = parent.children.indexOf(node);
-
- // Can we convert the whole text node into a doc link?
- const docs = getDocFromAlias(node.value);
- if (foundValidDoc(docs)) {
- parent.children.splice(index, 1, createLinkNode(docs[0], node.value));
- } else {
- // Parse the text for words that we can convert to links
- const nodes = textContent(node).split(/([A-Za-z0-9_.-]+)/)
- .filter(word => word.length)
- .map((word, index, words) => {
- // remove docs that fail the custom filter tests
- const filteredDocs = autoLinkCodeImpl.customFilters.reduce((docs, filter) => filter(docs, words, index), getDocFromAlias(word));
- return foundValidDoc(filteredDocs) ?
- createLinkNode(filteredDocs[0], word) : // Create a link wrapping the text node.
- { type: 'text', value: word }; // this is just text so push a new text node
- });
-
- // Replace the text node with the links and leftover text nodes
- Array.prototype.splice.apply(parent.children, [index, 1].concat(nodes));
- }
- }
- });
+ if (!isValidCodeElement(node, ancestors)) {
+ return;
}
+
+ visit(node, 'text', (node, ancestors) => {
+ const isInLink = isInsideLink(ancestors);
+ if (isInLink) {
+ return;
+ }
+
+ const parent = ancestors[ancestors.length - 1];
+ const index = parent.children.indexOf(node);
+
+ // Can we convert the whole text node into a doc link?
+ const docs = getFilteredDocsFromAlias([node.value], 0);
+ if (foundValidDoc(docs, node.value, file)) {
+ parent.children.splice(index, 1, createLinkNode(docs[0], node.value));
+ } else {
+ // Parse the text for words that we can convert to links
+ const nodes = getNodes(node, file);
+ // Replace the text node with the links and leftover text nodes
+ Array.prototype.splice.apply(parent.children, [index, 1].concat(nodes));
+ // Do not visit this node's children or the newly added nodes
+ return [visit.SKIP, index + nodes.length];
+ }
+ });
});
};
}
- function foundValidDoc(docs) {
- return docs.length === 1 && autoLinkCodeImpl.docTypes.indexOf(docs[0].docType) !== -1;
+
+ function isValidCodeElement(node, ancestors) {
+ // Only interested in code elements that:
+ // * do not have `no-auto-link` class
+ // * do not have an ignored language
+ // * are not inside links
+ const isCodeElement = autoLinkCodeImpl.codeElements.some(elementType => is(node, elementType));
+ const hasNoAutoLink =
+ node.properties.className && node.properties.className.includes('no-auto-link');
+ const isLanguageSupported =
+ !autoLinkCodeImpl.ignoredLanguages.includes(node.properties.language);
+ const isInLink = isInsideLink(ancestors);
+ return isCodeElement && !hasNoAutoLink && isLanguageSupported && !isInLink;
+ }
+
+ function isInsideLink(ancestors) {
+ return ancestors.some(ancestor => is(ancestor, 'a'));
+ }
+
+ function getFilteredDocsFromAlias(words, index) {
+ // Remove docs that fail the custom filter tests.
+ return autoLinkCodeImpl.customFilters.reduce(
+ (docs, filter) => filter(docs, words, index), getDocFromAlias(words[index]));
+ }
+
+ function getNodes(node, file) {
+ return textContent(node)
+ .split(/([A-Za-z0-9_.-]+)/)
+ .filter(word => word.length)
+ .map((word, index, words) => {
+ const filteredDocs = getFilteredDocsFromAlias(words, index);
+
+ return foundValidDoc(filteredDocs, word, file) ?
+ // Create a link wrapping the text node.
+ createLinkNode(filteredDocs[0], word) :
+ // this is just text so push a new text node
+ {type: 'text', value: word};
+ });
+ }
+
+ /**
+ * Validates the docs to be used to generate the links. The validation ensures
+ * that the docs are not `internal` and that the `docType` is supported. The `path`
+ * can be empty when the `API` is not public.
+ *
+ * @param {Array