chore: improve offline page handling and tests

nuxt-community · Feb 8, 2019 · 263dce6 · 263dce6
1 parent 5fc3d66
commit 263dce6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/packages/workbox/templates/sw.js b/packages/workbox/templates/sw.js
@@ -53,7 +53,7 @@ workbox.precaching.precacheAndRoute(<%= JSON.stringify(options.preCaching, null,
 
 <% if (options.offlinePage) { %>
 // Register router handler for offlinePage
-workbox.routing.registerRoute(new RegExp('/.*'), ({event}) => {
+workbox.routing.registerRoute(new RegExp('<%= options.pagesURLPattern %>'), ({event}) => {
   return workbox.strategies.networkOnly().handle({event})
     .catch(() => caches.match('<%= options.offlinePage %>'))
 })<% } %>

diff --git a/test/__snapshots__/pwa.test.js.snap b/test/__snapshots__/pwa.test.js.snap
@@ -47,6 +47,7 @@ Array [
   "fixture/dist/icons",
   "fixture/dist/icons/index.html",
   "fixture/dist/index.html",
+  "fixture/dist/offline.html",
 ]
 `;
 
@@ -103,7 +104,7 @@ workbox.routing.registerRoute(new RegExp('https://google.com/.*'), workbox.strat
 workbox.routing.registerRoute(new RegExp('/_nuxt/(?!.*(__webpack_hmr|hot-update))'), workbox.strategies.cacheFirst ({}), 'GET')
 
 // Register router handler for offlinePage
-workbox.routing.registerRoute(new RegExp('/.*'), ({event}) => {
+workbox.routing.registerRoute(new RegExp('^/(?!.*(__webpack_hmr|hot-update))'), ({event}) => {
   return workbox.strategies.networkOnly().handle({event})
     .catch(() => caches.match('/offline.html'))
 })

diff --git a/test/fixture/static/offline.html b/test/fixture/static/offline.html
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>Offline</title>
+  </head>
+  <body>
+    <h1>Website is Offline :(</h1>
+  </body>
+</html>