Fixed handling of 4xx status codes when using instant loading

Author: squidfunk

material/assets/javascripts/bundle.c2e1ee47.min.js

@@ -214,7 +214,7 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.ed9748b7.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.c2e1ee47.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

material/assets/javascripts/bundle.ed9748b7.min.js.map renamed to material/assets/javascripts/bundle.c2e1ee47.min.js.map

@@ -19,5 +19,5 @@
 {% endblock %}
 {% block scripts %}
   {{ super() }}
-  <script src="{{ 'overrides/assets/javascripts/bundle.641d98f2.min.js' | url }}"></script>
+  <script src="{{ 'overrides/assets/javascripts/bundle.2bc01bfd.min.js' | url }}"></script>
 {% endblock %}

material/assets/javascripts/bundle.ed9748b7.min.js

@@ -24,11 +24,12 @@ import {
   EMPTY,
   Observable,
   catchError,
-  filter,
   from,
   map,
+  of,
   shareReplay,
-  switchMap
+  switchMap,
+  throwError
 } from "rxjs"
 
 /* ----------------------------------------------------------------------------
@@ -51,8 +52,11 @@ export function request(
 ): Observable<Response> {
   return from(fetch(`${url}`, options))
     .pipe(
-      filter(res => res.status === 200),
-      catchError(() => EMPTY)
+      catchError(() => EMPTY),
+      switchMap(res => res.status !== 200
+        ? throwError(() => new Error(res.statusText))
+        : of(res)
+      )
     )
 }
 

material/base.html

@@ -22,7 +22,9 @@
 
 import { Repo, User } from "github-types"
 import {
+  EMPTY,
   Observable,
+  catchError,
   defaultIfEmpty,
   map,
   zip
@@ -65,6 +67,7 @@ export function fetchSourceFactsFromGitHub(
       /* Fetch version */
       requestJSON<Release>(`${url}/releases/latest`)
         .pipe(
+          catchError(() => EMPTY), // @todo refactor instant loading
           map(release => ({
             version: release.tag_name
           })),
@@ -74,6 +77,7 @@ export function fetchSourceFactsFromGitHub(
       /* Fetch stars and forks */
       requestJSON<Repo>(url)
         .pipe(
+          catchError(() => EMPTY), // @todo refactor instant loading
           map(info => ({
             stars: info.stargazers_count,
             forks: info.forks_count

material/overrides/assets/javascripts/bundle.2bc01bfd.min.js

@@ -22,7 +22,9 @@
 
 import { ProjectSchema } from "gitlab"
 import {
+  EMPTY,
   Observable,
+  catchError,
   defaultIfEmpty,
   map
 } from "rxjs"
@@ -49,6 +51,7 @@ export function fetchSourceFactsFromGitLab(
   const url = `https://${base}/api/v4/projects/${encodeURIComponent(project)}`
   return requestJSON<ProjectSchema>(url)
     .pipe(
+      catchError(() => EMPTY), // @todo refactor instant loading
       map(({ star_count, forks_count }) => ({
         stars: star_count,
         forks: forks_count

material/overrides/assets/javascripts/bundle.2bc01bfd.min.js.map

@@ -21,7 +21,9 @@
  */
 
 import {
+  EMPTY,
   Observable,
+  catchError,
   defaultIfEmpty,
   map,
   of,
@@ -97,6 +99,7 @@ export function fetchSitemap(base?: URL): Observable<Sitemap> {
         map(sitemap => preprocess(getElements("loc", sitemap)
           .map(node => node.textContent!)
         )),
+        catchError(() => EMPTY), // @todo refactor instant loading
         defaultIfEmpty([]),
         tap(sitemap => __md_set("__sitemap", sitemap, sessionStorage, base))
       )

material/overrides/assets/javascripts/bundle.641d98f2.min.js

@@ -23,6 +23,7 @@
 import {
   EMPTY,
   Subject,
+  catchError,
   combineLatest,
   filter,
   fromEvent,
@@ -73,6 +74,9 @@ export function setupVersionSelector(
   const versions$ = requestJSON<Version[]>(
     new URL("../versions.json", config.base)
   )
+    .pipe(
+      catchError(() => EMPTY) // @todo refactor instant loading
+    )
 
   /* Determine current version */
   const current$ = versions$