fix(gatsby): fix codepaths that result in js errors (#21829)

gatsbyjs · Mar 2, 2020 · a87f1bd · a87f1bd
1 parent dc484eb
commit a87f1bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/gatsby/cache-dir/loader.js b/packages/gatsby/cache-dir/loader.js
@@ -353,7 +353,9 @@ const createComponentUrls = componentChunkName =>
 export class ProdLoader extends BaseLoader {
   constructor(asyncRequires, matchPaths) {
     const loadComponent = chunkName =>
-      asyncRequires.components[chunkName]().then(preferDefault)
+      asyncRequires.components[chunkName]
+        ? asyncRequires.components[chunkName]().then(preferDefault)
+        : Promise.resolve()
 
     super(loadComponent, matchPaths)
   }

diff --git a/packages/gatsby/cache-dir/navigation.js b/packages/gatsby/cache-dir/navigation.js
@@ -84,7 +84,10 @@ const navigate = (to, options = {}) => {
     if (!pageResources || pageResources.status === `error`) {
       window.history.replaceState({}, ``, location.href)
       window.location = pathname
+      clearTimeout(timeoutId)
+      return
     }
+
     // If the loaded page has a different compilation hash to the
     // window, then a rebuild has occurred on the server. Reload.
     if (process.env.NODE_ENV === `production` && pageResources) {