Merge branch 'master' into fix-windows-test

gatsbyjs · Nov 13, 2017 · fb62b54 · fb62b54
2 parents 3403b73 + 3267d6e
commit fb62b54
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/packages/gatsby-link/index.d.ts b/packages/gatsby-link/index.d.ts
@@ -8,4 +8,6 @@ export interface GatsbyLinkProps extends NavLinkProps {
 
 export const navigateTo: (path: string) => void;
 
+export const withPrefix: (path: string) => string;
+
 export default class GatsbyLink extends React.Component<GatsbyLinkProps> { }
diff --git a/packages/gatsby/cache-dir/component-renderer.js b/packages/gatsby/cache-dir/component-renderer.js
@@ -12,8 +12,18 @@ const DefaultLayout = ({ children }) => <div>{children()}</div>
 class ComponentRenderer extends React.Component {
   constructor(props) {
     super()
+    let location = props.location
+
+    // This covers layout for when page not found, especially during production
+    if (!loader.getPage(location.pathname)) {
+      location = Object.assign({}, location, {
+        ...location,
+        pathname: `/404.html`,
+      })
+    }
+
     this.state = {
-      location: props.location,
+      location,
       pageResources: loader.getResourcesForPathname(props.location.pathname),
     }
   }
@@ -61,7 +71,10 @@ class ComponentRenderer extends React.Component {
     // This is only useful on delayed transitions as the page will get rendered
     // without the necessary page resources and then re-render once those come in.
     emitter.on(`onPostLoadPageResources`, e => {
-      if (e.page.path === loader.getPage(this.state.location.pathname).path) {
+      if (
+        loader.getPage(this.state.location.pathname) &&
+        e.page.path === loader.getPage(this.state.location.pathname).path
+      ) {
         this.setState({ pageResources: e.pageResources })
       }
     })

diff --git a/packages/gatsby/cache-dir/loader.js b/packages/gatsby/cache-dir/loader.js
@@ -222,10 +222,15 @@ const queue = {
         navigator.serviceWorker
           .getRegistrations()
           .then(function(registrations) {
-            for (let registration of registrations) {
-              registration.unregister()
+            // We would probably need this to
+            // prevent unnecessary reloading of the page
+            // while unregistering of ServiceWorker is not happening
+            if (registrations.length) {
+              for (let registration of registrations) {
+                registration.unregister()
+              }
+              window.location.reload()
             }
-            window.location.reload()
           })
       }
     }
@@ -249,7 +254,7 @@ const queue = {
 
       if (!page) {
         console.log(`A page wasn't found for "${path}"`)
-        return
+        return cb()
       }
 
       // Use the path from the page so the pathScriptsCache uses

diff --git a/packages/gatsby/cache-dir/production-app.js b/packages/gatsby/cache-dir/production-app.js
@@ -161,7 +161,8 @@ apiRunnerAsync(`onClientEntry`).then(() => {
                     })
                   } else {
                     return createElement(ComponentRenderer, {
-                      location: { page: true, pathname: `/404.html` },
+                      page: true,
+                      location: { pathname: `/404.html` },
                     })
                   }
                 },