switch to cacheInvalidatingPaths

src/handlers.js

@@ -13,7 +13,7 @@ export default function getHandlers(assetInfo: AssetInfo) {
   const {
     precachePaths,
     cacheablePaths,
-    cacheableDomains,
+    cacheInvalidatingPatterns,
     maxCacheDurationMs = defaultMaxCacheDuration,
   } = assetInfo;
   return {
@@ -51,12 +51,15 @@ export default function getHandlers(assetInfo: AssetInfo) {
     onFetch: (event: FetchEvent) => {
       try {
         const expectsHtml = requestExpectsHtml(event.request);
-        if (
-          expectsHtml &&
-          !requestingFromCacheableDomain(event, cacheableDomains)
-        ) {
+        if (useNetwork(event, expectsHtml, cacheInvalidatingPatterns)) {
           // clear cache then bypass service worker, use network
-          return caches.delete(cacheName);
+          return caches
+            .delete(cacheName)
+            .then(() =>
+              debug.log(
+                `[debug] navigation to ${event.request.url}, bypassed cache`
+              )
+            );
         }
         if (requestNotCacheable(expectsHtml, cacheablePaths, event)) {
           // bypass service worker, use network
@@ -158,10 +161,12 @@ function cacheHasExpired(cachedResponse, maxCacheDurationMs) {
     : false;
 }
 
-function requestingFromCacheableDomain(event, cacheableDomains) {
+function useNetwork(event, expectsHTML, cacheInvalidatingPatterns) {
   return (
-    !cacheableDomains ||
-    cacheableDomains.some(domain => domain.indexOf(event.request.url) > -1)
+    cacheInvalidatingPatterns &&
+    cacheInvalidatingPatterns.some(
+      pattern => event.request.url.indexOf(pattern) > -1
+    )
   );
 }
 

src/server.js

@@ -24,7 +24,7 @@ export default ((__NODE__ &&
     },
     middleware: ({
       templateFn,
-      options: {cacheableDomains, maxCacheDurationMs} = {},
+      options: {cacheInvalidatingPatterns, maxCacheDurationMs} = {},
     }) => {
       return async (ctx, next) => {
         if (__NODE__) {
@@ -42,7 +42,7 @@ export default ((__NODE__ &&
                 precachePaths: chunkUrls.filter(url =>
                   hasSameHostName(url, ctx.url)
                 ),
-                cacheableDomains,
+                cacheInvalidatingPatterns,
                 maxCacheDurationMs,
               });
             } catch (e) {

src/tokens.js

@@ -12,7 +12,7 @@ import type {Token} from 'fusion-core';
 import type {ConfigTokenType, SWLoggerTokenType} from './types.js';
 
 type Options = {
-  cacheableDomains?: Array<string>,
+  cacheInvalidatingPatterns?: Array<string>,
   maxCacheDurationMs?: number,
 };
 

src/types.js

@@ -13,7 +13,7 @@ export type PluginServiceType = {
 export type AssetInfo = {
   precachePaths: Array<RequestInfo>,
   cacheablePaths: Array<RequestInfo>,
-  cacheableDomains?: Array<string>,
+  cacheInvalidatingPatterns?: Array<string>,
   maxCacheDurationMs?: number,
 };