@serwist/next 9.0.0-preview.2 → 9.0.0-preview.3

package/dist/index.worker.d.ts

@@ -1,5 +1,4 @@
+import { PAGES_CACHE_NAME } from "./worker/constants.js";
 import { defaultCache } from "./worker/defaultCache.js";
-import { type DefinePageRuntimeCachingOptions, type PageRuntimeCaching, definePageRuntimeCaching } from "./worker/definePageRuntimeCaching.js";
-export { defaultCache, definePageRuntimeCaching };
-export type { DefinePageRuntimeCachingOptions, PageRuntimeCaching };
+export { defaultCache, PAGES_CACHE_NAME };
 //# sourceMappingURL=index.worker.d.ts.map

package/dist/index.worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.worker.d.ts","sourceRoot":"","sources":["../src/index.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,KAAK,+BAA+B,EAAE,KAAK,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAE/I,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAClD,YAAY,EAAE,+BAA+B,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"index.worker.d.ts","sourceRoot":"","sources":["../src/index.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/index.worker.js

@@ -1,160 +1,159 @@
-const nonNullable = (value)=>value !== null && value !== undefined;
+import { ExpirationPlugin } from '@serwist/expiration';
+import { RangeRequestsPlugin } from '@serwist/range-requests';
+import { CacheFirst, StaleWhileRevalidate, NetworkFirst } from '@serwist/strategies';
 
-const definePageRuntimeCaching = ({ rscPrefetch, rsc, html })=>{
-    const pageRcs = [
-        rscPrefetch,
-        rsc,
-        html
-    ];
-    if (pageRcs[0]) {
-        if (!pageRcs[0].options) pageRcs[0].options = {};
-        pageRcs[0].options.cacheName = "pages-rsc-prefetch";
-    }
-    if (pageRcs[1]) {
-        if (!pageRcs[1].options) pageRcs[1].options = {};
-        pageRcs[1].options.cacheName = "pages-rsc";
-    }
-    if (pageRcs[2]) {
-        if (!pageRcs[2].options) pageRcs[2].options = {};
-        pageRcs[2].options.cacheName = "pages";
-    }
-    return pageRcs.filter(nonNullable);
+const PAGES_CACHE_NAME = {
+    rscPrefetch: "pages-rsc-prefetch",
+    rsc: "pages-rsc",
+    html: "pages"
 };
 
 const defaultCache = [
     {
         urlPattern: /^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,
-        handler: "CacheFirst",
-        options: {
+        handler: new CacheFirst({
             cacheName: "google-fonts-webfonts",
-            expiration: {
-                maxEntries: 4,
-                maxAgeSeconds: 365 * 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 4,
+                    maxAgeSeconds: 365 * 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        handler: new StaleWhileRevalidate({
             cacheName: "google-fonts-stylesheets",
-            expiration: {
-                maxEntries: 4,
-                maxAgeSeconds: 7 * 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 4,
+                    maxAgeSeconds: 7 * 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        handler: new StaleWhileRevalidate({
             cacheName: "static-font-assets",
-            expiration: {
-                maxEntries: 4,
-                maxAgeSeconds: 7 * 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 4,
+                    maxAgeSeconds: 7 * 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        handler: new StaleWhileRevalidate({
             cacheName: "static-image-assets",
-            expiration: {
-                maxEntries: 64,
-                maxAgeSeconds: 30 * 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 64,
+                    maxAgeSeconds: 30 * 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /\/_next\/static.+\.js$/i,
-        handler: "CacheFirst",
-        options: {
+        handler: new CacheFirst({
             cacheName: "next-static-js-assets",
-            expiration: {
-                maxEntries: 64,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 64,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /\/_next\/image\?url=.+$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        handler: new StaleWhileRevalidate({
             cacheName: "next-image",
-            expiration: {
-                maxEntries: 64,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 64,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /\.(?:mp3|wav|ogg)$/i,
-        handler: "CacheFirst",
-        options: {
-            rangeRequests: true,
+        handler: new CacheFirst({
             cacheName: "static-audio-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                }),
+                new RangeRequestsPlugin()
+            ]
+        })
     },
     {
         urlPattern: /\.(?:mp4|webm)$/i,
-        handler: "CacheFirst",
-        options: {
-            rangeRequests: true,
+        handler: new CacheFirst({
             cacheName: "static-video-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                }),
+                new RangeRequestsPlugin()
+            ]
+        })
     },
     {
         urlPattern: /\.(?:js)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        handler: new StaleWhileRevalidate({
             cacheName: "static-js-assets",
-            expiration: {
-                maxEntries: 48,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 48,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /\.(?:css|less)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        handler: new StaleWhileRevalidate({
             cacheName: "static-style-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /\/_next\/data\/.+\/.+\.json$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        handler: new StaleWhileRevalidate({
             cacheName: "next-data",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: /\.(?:json|xml|csv)$/i,
-        handler: "NetworkFirst",
-        options: {
+        handler: new NetworkFirst({
             cacheName: "static-data-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: ({ sameOrigin, url: { pathname } })=>{
@@ -166,72 +165,79 @@ const defaultCache = [
             }
             return false;
         },
-        handler: "NetworkFirst",
         method: "GET",
-        options: {
+        handler: new NetworkFirst({
             cacheName: "apis",
-            expiration: {
-                maxEntries: 16,
-                maxAgeSeconds: 24 * 60 * 60
-            },
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 16,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ],
             networkTimeoutSeconds: 10
-        }
-    },
-    ...definePageRuntimeCaching({
-        rscPrefetch: {
-            urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("RSC") === "1" && request.headers.get("Next-Router-Prefetch") === "1" && sameOrigin && !pathname.startsWith("/api/"),
-            handler: "NetworkFirst",
-            options: {
-                expiration: {
+        })
+    },
+    {
+        urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("RSC") === "1" && request.headers.get("Next-Router-Prefetch") === "1" && sameOrigin && !pathname.startsWith("/api/"),
+        handler: new NetworkFirst({
+            cacheName: PAGES_CACHE_NAME.rscPrefetch,
+            plugins: [
+                new ExpirationPlugin({
                     maxEntries: 32,
                     maxAgeSeconds: 24 * 60 * 60
-                }
-            }
-        },
-        rsc: {
-            urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("RSC") === "1" && sameOrigin && !pathname.startsWith("/api/"),
-            handler: "NetworkFirst",
-            options: {
-                expiration: {
+                })
+            ]
+        })
+    },
+    {
+        urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("RSC") === "1" && sameOrigin && !pathname.startsWith("/api/"),
+        handler: new NetworkFirst({
+            cacheName: PAGES_CACHE_NAME.rsc,
+            plugins: [
+                new ExpirationPlugin({
                     maxEntries: 32,
                     maxAgeSeconds: 24 * 60 * 60
-                }
-            }
-        },
-        html: {
-            urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("Content-Type")?.includes("text/html") && sameOrigin && !pathname.startsWith("/api/"),
-            handler: "NetworkFirst",
-            options: {
-                expiration: {
+                })
+            ]
+        })
+    },
+    {
+        urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("Content-Type")?.includes("text/html") && sameOrigin && !pathname.startsWith("/api/"),
+        handler: new NetworkFirst({
+            cacheName: PAGES_CACHE_NAME.html,
+            plugins: [
+                new ExpirationPlugin({
                     maxEntries: 32,
                     maxAgeSeconds: 24 * 60 * 60
-                }
-            }
-        }
-    }),
+                })
+            ]
+        })
+    },
     {
         urlPattern: ({ url: { pathname }, sameOrigin })=>sameOrigin && !pathname.startsWith("/api/"),
-        handler: "NetworkFirst",
-        options: {
+        handler: new NetworkFirst({
             cacheName: "others",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
         urlPattern: ({ sameOrigin })=>!sameOrigin,
-        handler: "NetworkFirst",
-        options: {
+        handler: new NetworkFirst({
             cacheName: "cross-origin",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 60 * 60
-            },
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 60 * 60
+                })
+            ],
             networkTimeoutSeconds: 10
-        }
+        })
     }
 ];
 
-export { defaultCache, definePageRuntimeCaching };
+export { PAGES_CACHE_NAME, defaultCache };

package/dist/worker/constants.d.ts

@@ -0,0 +1,6 @@
+export declare const PAGES_CACHE_NAME: {
+    readonly rscPrefetch: "pages-rsc-prefetch";
+    readonly rsc: "pages-rsc";
+    readonly html: "pages";
+};
+//# sourceMappingURL=constants.d.ts.map

package/dist/worker/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/worker/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB;;;;CAInB,CAAC"}

package/dist/worker/defaultCache.d.ts

@@ -1,3 +1,15 @@
-import type { RuntimeCaching } from "@serwist/sw";
-export declare const defaultCache: RuntimeCaching[];
+import { CacheFirst, NetworkFirst } from "@serwist/strategies";
+export declare const defaultCache: ({
+    urlPattern: RegExp;
+    handler: CacheFirst;
+    method?: undefined;
+} | {
+    urlPattern: ({ sameOrigin, url: { pathname } }: import("@serwist/core").RouteMatchCallbackOptions) => boolean;
+    method: "GET";
+    handler: NetworkFirst;
+} | {
+    urlPattern: ({ request, url: { pathname }, sameOrigin }: import("@serwist/core").RouteMatchCallbackOptions) => boolean | undefined;
+    handler: NetworkFirst;
+    method?: undefined;
+})[];
 //# sourceMappingURL=defaultCache.d.ts.map

package/dist/worker/defaultCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultCache.d.ts","sourceRoot":"","sources":["../../src/worker/defaultCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,eAAO,MAAM,YAAY,kBA0NG,CAAC"}
+{"version":3,"file":"defaultCache.d.ts","sourceRoot":"","sources":["../../src/worker/defaultCache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAwB,MAAM,qBAAqB,CAAC;AAMrF,eAAO,MAAM,YAAY;;;;;;;;;;;;IA6OG,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "9.0.0-preview.2",
+  "version": "9.0.0-preview.3",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
@@ -53,10 +53,13 @@
     "chalk": "5.3.0",
     "clean-webpack-plugin": "4.0.0",
     "fast-glob": "3.3.2",
-    "@serwist/build": "9.0.0-preview.2",
-    "@serwist/core": "9.0.0-preview.2",
-    "@serwist/webpack-plugin": "9.0.0-preview.2",
-    "@serwist/window": "9.0.0-preview.2"
+    "@serwist/build": "9.0.0-preview.3",
+    "@serwist/core": "9.0.0-preview.3",
+    "@serwist/expiration": "9.0.0-preview.3",
+    "@serwist/range-requests": "9.0.0-preview.3",
+    "@serwist/strategies": "9.0.0-preview.3",
+    "@serwist/webpack-plugin": "9.0.0-preview.3",
+    "@serwist/window": "9.0.0-preview.3"
   },
   "devDependencies": {
     "@types/node": "20.11.16",
@@ -67,15 +70,15 @@
     "type-fest": "4.10.2",
     "typescript": "5.4.0-dev.20240206",
     "webpack": "5.90.1",
-    "@serwist/constants": "9.0.0-preview.2",
-    "@serwist/sw": "9.0.0-preview.2",
-    "@serwist/utils": "9.0.0-preview.2"
+    "@serwist/constants": "9.0.0-preview.3",
+    "@serwist/sw": "9.0.0-preview.3",
+    "@serwist/utils": "9.0.0-preview.3"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
     "typescript": ">=5.0.0",
     "webpack": ">=5.9.0",
-    "@serwist/sw": "9.0.0-preview.2"
+    "@serwist/sw": "9.0.0-preview.3"
   },
   "peerDependenciesMeta": {
     "@serwist/sw": {

package/src/index.worker.ts

@@ -1,5 +1,4 @@
+import { PAGES_CACHE_NAME } from "./worker/constants.js";
 import { defaultCache } from "./worker/defaultCache.js";
-import { type DefinePageRuntimeCachingOptions, type PageRuntimeCaching, definePageRuntimeCaching } from "./worker/definePageRuntimeCaching.js";
 
-export { defaultCache, definePageRuntimeCaching };
-export type { DefinePageRuntimeCachingOptions, PageRuntimeCaching };
+export { defaultCache, PAGES_CACHE_NAME };

package/src/worker/constants.ts

@@ -0,0 +1,5 @@
+export const PAGES_CACHE_NAME = {
+  rscPrefetch: "pages-rsc-prefetch",
+  rsc: "pages-rsc",
+  html: "pages",
+} as const;

package/src/worker/defaultCache.ts

@@ -1,141 +1,157 @@
+import { ExpirationPlugin } from "@serwist/expiration";
+import { RangeRequestsPlugin } from "@serwist/range-requests";
+import { CacheFirst, NetworkFirst, StaleWhileRevalidate } from "@serwist/strategies";
 import type { RuntimeCaching } from "@serwist/sw";
-import { definePageRuntimeCaching } from "./definePageRuntimeCaching.js";
 
-// Serwist RuntimeCaching config: https://developers.google.com/web/tools/workbox/reference-docs/latest/module-workbox-build#.RuntimeCachingEntry
+import { PAGES_CACHE_NAME } from "./constants.js";
+
+// Serwist RuntimeCaching config: https://serwist.pages.dev/docs/sw/register-runtime-caching
 export const defaultCache = [
   {
     urlPattern: /^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,
-    handler: "CacheFirst",
-    options: {
+    handler: new CacheFirst({
       cacheName: "google-fonts-webfonts",
-      expiration: {
-        maxEntries: 4,
-        maxAgeSeconds: 365 * 24 * 60 * 60, // 365 days
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 4,
+          maxAgeSeconds: 365 * 24 * 60 * 60, // 365 days
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,
-    handler: "StaleWhileRevalidate",
-    options: {
+    handler: new StaleWhileRevalidate({
       cacheName: "google-fonts-stylesheets",
-      expiration: {
-        maxEntries: 4,
-        maxAgeSeconds: 7 * 24 * 60 * 60, // 7 days
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 4,
+          maxAgeSeconds: 7 * 24 * 60 * 60, // 7 days
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
+    handler: new StaleWhileRevalidate({
       cacheName: "static-font-assets",
-      expiration: {
-        maxEntries: 4,
-        maxAgeSeconds: 7 * 24 * 60 * 60, // 7 days
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 4,
+          maxAgeSeconds: 7 * 24 * 60 * 60, // 7 days
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
+    handler: new StaleWhileRevalidate({
       cacheName: "static-image-assets",
-      expiration: {
-        maxEntries: 64,
-        maxAgeSeconds: 30 * 24 * 60 * 60, // 30 days
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 64,
+          maxAgeSeconds: 30 * 24 * 60 * 60, // 30 days
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /\/_next\/static.+\.js$/i,
-    handler: "CacheFirst",
-    options: {
+    handler: new CacheFirst({
       cacheName: "next-static-js-assets",
-      expiration: {
-        maxEntries: 64,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 64,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /\/_next\/image\?url=.+$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
+    handler: new StaleWhileRevalidate({
       cacheName: "next-image",
-      expiration: {
-        maxEntries: 64,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 64,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /\.(?:mp3|wav|ogg)$/i,
-    handler: "CacheFirst",
-    options: {
-      rangeRequests: true,
+    handler: new CacheFirst({
       cacheName: "static-audio-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+        new RangeRequestsPlugin(),
+      ],
+    }),
   },
   {
     urlPattern: /\.(?:mp4|webm)$/i,
-    handler: "CacheFirst",
-    options: {
-      rangeRequests: true,
+    handler: new CacheFirst({
       cacheName: "static-video-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+        new RangeRequestsPlugin(),
+      ],
+    }),
   },
   {
     urlPattern: /\.(?:js)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
+    handler: new StaleWhileRevalidate({
       cacheName: "static-js-assets",
-      expiration: {
-        maxEntries: 48,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 48,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /\.(?:css|less)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
+    handler: new StaleWhileRevalidate({
       cacheName: "static-style-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /\/_next\/data\/.+\/.+\.json$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
+    handler: new StaleWhileRevalidate({
       cacheName: "next-data",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
     urlPattern: /\.(?:json|xml|csv)$/i,
-    handler: "NetworkFirst",
-    options: {
+    handler: new NetworkFirst({
       cacheName: "static-data-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
     urlPattern: ({ sameOrigin, url: { pathname } }) => {
@@ -152,72 +168,79 @@ export const defaultCache = [
 
       return false;
     },
-    handler: "NetworkFirst",
     method: "GET",
-    options: {
+    handler: new NetworkFirst({
       cacheName: "apis",
-      expiration: {
-        maxEntries: 16,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 16,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
       networkTimeoutSeconds: 10, // fallback to cache if API does not response within 10 seconds
-    },
+    }),
   },
-  ...definePageRuntimeCaching({
-    rscPrefetch: {
-      urlPattern: ({ request, url: { pathname }, sameOrigin }) =>
-        request.headers.get("RSC") === "1" && request.headers.get("Next-Router-Prefetch") === "1" && sameOrigin && !pathname.startsWith("/api/"),
-      handler: "NetworkFirst",
-      options: {
-        expiration: {
+  {
+    urlPattern: ({ request, url: { pathname }, sameOrigin }) =>
+      request.headers.get("RSC") === "1" && request.headers.get("Next-Router-Prefetch") === "1" && sameOrigin && !pathname.startsWith("/api/"),
+    handler: new NetworkFirst({
+      cacheName: PAGES_CACHE_NAME.rscPrefetch,
+      plugins: [
+        new ExpirationPlugin({
           maxEntries: 32,
           maxAgeSeconds: 24 * 60 * 60, // 24 hours
-        },
-      },
-    },
-    rsc: {
-      urlPattern: ({ request, url: { pathname }, sameOrigin }) => request.headers.get("RSC") === "1" && sameOrigin && !pathname.startsWith("/api/"),
-      handler: "NetworkFirst",
-      options: {
-        expiration: {
+        }),
+      ],
+    }),
+  },
+  {
+    urlPattern: ({ request, url: { pathname }, sameOrigin }) => request.headers.get("RSC") === "1" && sameOrigin && !pathname.startsWith("/api/"),
+    handler: new NetworkFirst({
+      cacheName: PAGES_CACHE_NAME.rsc,
+      plugins: [
+        new ExpirationPlugin({
           maxEntries: 32,
           maxAgeSeconds: 24 * 60 * 60, // 24 hours
-        },
-      },
-    },
-    html: {
-      urlPattern: ({ request, url: { pathname }, sameOrigin }) =>
-        request.headers.get("Content-Type")?.includes("text/html") && sameOrigin && !pathname.startsWith("/api/"),
-      handler: "NetworkFirst",
-      options: {
-        expiration: {
+        }),
+      ],
+    }),
+  },
+  {
+    urlPattern: ({ request, url: { pathname }, sameOrigin }) =>
+      request.headers.get("Content-Type")?.includes("text/html") && sameOrigin && !pathname.startsWith("/api/"),
+    handler: new NetworkFirst({
+      cacheName: PAGES_CACHE_NAME.html,
+      plugins: [
+        new ExpirationPlugin({
           maxEntries: 32,
           maxAgeSeconds: 24 * 60 * 60, // 24 hours
-        },
-      },
-    },
-  }),
+        }),
+      ],
+    }),
+  },
   {
     urlPattern: ({ url: { pathname }, sameOrigin }) => sameOrigin && !pathname.startsWith("/api/"),
-    handler: "NetworkFirst",
-    options: {
+    handler: new NetworkFirst({
       cacheName: "others",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
     urlPattern: ({ sameOrigin }) => !sameOrigin,
-    handler: "NetworkFirst",
-    options: {
+    handler: new NetworkFirst({
       cacheName: "cross-origin",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 60 * 60, // 1 hour
-      },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 60 * 60, // 1 hour
+        }),
+      ],
       networkTimeoutSeconds: 10,
-    },
+    }),
   },
 ] satisfies RuntimeCaching[];

package/dist/worker/definePageRuntimeCaching.d.ts

@@ -1,16 +0,0 @@
-import type { RuntimeCaching } from "@serwist/sw";
-export interface PageRuntimeCaching extends Omit<RuntimeCaching, "options"> {
-    options?: Omit<NonNullable<RuntimeCaching["options"]>, "cacheName">;
-}
-export interface DefinePageRuntimeCachingOptions {
-    rscPrefetch?: PageRuntimeCaching;
-    rsc?: PageRuntimeCaching;
-    html?: PageRuntimeCaching;
-}
-/**
- * Conveniently define three `runtimeCaching` entries for Next.js pages.
- * @param options
- * @returns
- */
-export declare const definePageRuntimeCaching: ({ rscPrefetch, rsc, html }: DefinePageRuntimeCachingOptions) => RuntimeCaching[];
-//# sourceMappingURL=definePageRuntimeCaching.d.ts.map

package/dist/worker/definePageRuntimeCaching.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"definePageRuntimeCaching.d.ts","sourceRoot":"","sources":["../../src/worker/definePageRuntimeCaching.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC;IACzE,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,+BAA+B;IAC9C,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,GAAG,CAAC,EAAE,kBAAkB,CAAC;IACzB,IAAI,CAAC,EAAE,kBAAkB,CAAC;CAC3B;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,+BAAgC,+BAA+B,KAAG,cAAc,EAiBpH,CAAC"}

package/src/worker/definePageRuntimeCaching.ts

@@ -1,36 +0,0 @@
-import type { RuntimeCaching } from "@serwist/sw";
-import { nonNullable } from "@serwist/utils";
-
-export interface PageRuntimeCaching extends Omit<RuntimeCaching, "options"> {
-  options?: Omit<NonNullable<RuntimeCaching["options"]>, "cacheName">;
-}
-
-export interface DefinePageRuntimeCachingOptions {
-  rscPrefetch?: PageRuntimeCaching;
-  rsc?: PageRuntimeCaching;
-  html?: PageRuntimeCaching;
-}
-
-/**
- * Conveniently define three `runtimeCaching` entries for Next.js pages.
- * @param options
- * @returns
- */
-export const definePageRuntimeCaching = ({ rscPrefetch, rsc, html }: DefinePageRuntimeCachingOptions): RuntimeCaching[] => {
-  const pageRcs = [rscPrefetch, rsc, html] as RuntimeCaching[];
-
-  if (pageRcs[0]) {
-    if (!pageRcs[0].options) pageRcs[0].options = {};
-    pageRcs[0].options.cacheName = "pages-rsc-prefetch";
-  }
-  if (pageRcs[1]) {
-    if (!pageRcs[1].options) pageRcs[1].options = {};
-    pageRcs[1].options.cacheName = "pages-rsc";
-  }
-  if (pageRcs[2]) {
-    if (!pageRcs[2].options) pageRcs[2].options = {};
-    pageRcs[2].options.cacheName = "pages";
-  }
-
-  return pageRcs.filter(nonNullable);
-};