@serwist/recipes 9.0.0-preview.21 → 9.0.0-preview.24

package/dist/googleFontsCache.d.ts

@@ -1,10 +1,9 @@
-import { type Router } from "@serwist/sw/routing";
+import { Serwist } from "serwist";
 export interface GoogleFontCacheOptions {
     /**
-     * An optional `Router` instance. If not provided, the singleton `Router`
-     * will be used.
+     * Your `Serwist` instance.
      */
-    router?: Router;
+    serwist: Serwist;
     /**
      * Cache prefix for caching stylesheets and webfonts. Defaults to google-fonts.
      */
@@ -23,5 +22,5 @@ export interface GoogleFontCacheOptions {
  *
  * @param options
  */
-export declare const googleFontsCache: ({ router, cachePrefix, maxAgeSeconds, maxEntries, }?: GoogleFontCacheOptions) => void;
+export declare const googleFontsCache: ({ serwist, cachePrefix, maxAgeSeconds, maxEntries, }: GoogleFontCacheOptions) => void;
 //# sourceMappingURL=googleFontsCache.d.ts.map

package/dist/googleFontsCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"googleFontsCache.d.ts","sourceRoot":"","sources":["../src/googleFontsCache.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,MAAM,EAAsB,MAAM,qBAAqB,CAAC;AAGtE,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,yDAK1B,sBAAsB,KAAQ,IAyBhC,CAAC"}
+{"version":3,"file":"googleFontsCache.d.ts","sourceRoot":"","sources":["../src/googleFontsCache.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAIlC,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,yDAK1B,sBAAsB,KAAG,IAyB3B,CAAC"}

package/dist/imageCache.d.ts

@@ -1,11 +1,10 @@
-import type { RouteMatchCallback, SerwistPlugin } from "@serwist/core";
-import { type Router } from "@serwist/sw/routing";
+import type { RouteMatchCallback, SerwistPlugin } from "serwist";
+import { Serwist } from "serwist";
 export interface ImageCacheOptions {
     /**
-     * An optional `Router` instance. If not provided, the singleton `Router`
-     * will be used.
+     * Your `Serwist` instance.
      */
-    router?: Router;
+    serwist: Serwist;
     /**
      * Name for cache. Defaults to images.
      */
@@ -36,5 +35,5 @@ export interface ImageCacheOptions {
  *
  * @param options
  */
-export declare const imageCache: ({ router, cacheName, matchCallback, maxAgeSeconds, maxEntries, plugins, warmCache, }?: ImageCacheOptions) => void;
+export declare const imageCache: ({ serwist, cacheName, matchCallback, maxAgeSeconds, maxEntries, plugins, warmCache, }: ImageCacheOptions) => void;
 //# sourceMappingURL=imageCache.d.ts.map

package/dist/imageCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageCache.d.ts","sourceRoot":"","sources":["../src/imageCache.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAA6B,aAAa,EAAE,MAAM,eAAe,CAAC;AAElG,OAAO,EAAE,KAAK,MAAM,EAAsB,MAAM,qBAAqB,CAAC;AAItE,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,eAAO,MAAM,UAAU,0FAQpB,iBAAiB,KAAQ,IAwB3B,CAAC"}
+{"version":3,"file":"imageCache.d.ts","sourceRoot":"","sources":["../src/imageCache.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAA6B,aAAa,EAAE,MAAM,SAAS,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAKlC,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,eAAO,MAAM,UAAU,0FAQpB,iBAAiB,KAAG,IAwBtB,CAAC"}

package/dist/index.js

@@ -1,13 +1,11 @@
-import { CacheableResponsePlugin, ExpirationPlugin } from '@serwist/sw/plugins';
-import { getSingletonRouter, setCatchHandler } from '@serwist/sw/routing';
-import { StaleWhileRevalidate, CacheFirst, NetworkFirst } from '@serwist/sw/strategies';
-import { getSingletonPrecacheController } from '@serwist/sw/precaching';
+import { CacheableResponsePlugin, ExpirationPlugin } from 'serwist/plugins';
+import { StaleWhileRevalidate, CacheFirst, NetworkFirst } from 'serwist/strategies';
 
-const googleFontsCache = ({ router = getSingletonRouter(), cachePrefix = "google-fonts", maxAgeSeconds = 60 * 60 * 24 * 365, maxEntries = 30 } = {})=>{
-    router.registerCapture(({ url })=>url.origin === "https://fonts.googleapis.com", new StaleWhileRevalidate({
+const googleFontsCache = ({ serwist, cachePrefix = "google-fonts", maxAgeSeconds = 60 * 60 * 24 * 365, maxEntries = 30 })=>{
+    serwist.registerCapture(({ url })=>url.origin === "https://fonts.googleapis.com", new StaleWhileRevalidate({
         cacheName: `${cachePrefix}-stylesheets`
     }));
-    router.registerCapture(({ url })=>url.origin === "https://fonts.gstatic.com", new CacheFirst({
+    serwist.registerCapture(({ url })=>url.origin === "https://fonts.gstatic.com", new CacheFirst({
         cacheName: `${cachePrefix}-webfonts`,
         plugins: [
             new CacheableResponsePlugin({
@@ -34,7 +32,7 @@ const warmStrategyCache = (options)=>{
     });
 };
 
-const imageCache = ({ router = getSingletonRouter(), cacheName = "images", matchCallback = ({ request })=>request.destination === "image", maxAgeSeconds = 30 * 24 * 60 * 60, maxEntries = 60, plugins = [], warmCache } = {})=>{
+const imageCache = ({ serwist, cacheName = "images", matchCallback = ({ request })=>request.destination === "image", maxAgeSeconds = 30 * 24 * 60 * 60, maxEntries = 60, plugins = [], warmCache })=>{
     plugins.push(new CacheableResponsePlugin({
         statuses: [
             0,
@@ -49,7 +47,7 @@ const imageCache = ({ router = getSingletonRouter(), cacheName = "images", match
         cacheName,
         plugins
     });
-    router.registerCapture(matchCallback, strategy);
+    serwist.registerCapture(matchCallback, strategy);
     if (warmCache) {
         warmStrategyCache({
             urls: warmCache,
@@ -58,7 +56,7 @@ const imageCache = ({ router = getSingletonRouter(), cacheName = "images", match
     }
 };
 
-const offlineFallback = ({ precacheController = getSingletonPrecacheController(), pageFallback = "offline.html", imageFallback, fontFallback } = {})=>{
+const offlineFallback = ({ serwist, pageFallback = "offline.html", imageFallback, fontFallback })=>{
     self.addEventListener("install", (event)=>{
         const files = [
             pageFallback
@@ -75,23 +73,23 @@ const offlineFallback = ({ precacheController = getSingletonPrecacheController()
         const dest = options.request.destination;
         const cache = await self.caches.open("serwist-offline-fallbacks");
         if (dest === "document") {
-            const match = await precacheController.matchPrecache(pageFallback) || await cache.match(pageFallback);
+            const match = await serwist.matchPrecache(pageFallback) || await cache.match(pageFallback);
             return match || Response.error();
         }
         if (dest === "image" && imageFallback !== undefined) {
-            const match = await precacheController.matchPrecache(imageFallback) || await cache.match(imageFallback);
+            const match = await serwist.matchPrecache(imageFallback) || await cache.match(imageFallback);
             return match || Response.error();
         }
         if (dest === "font" && fontFallback !== undefined) {
-            const match = await precacheController.matchPrecache(fontFallback) || await cache.match(fontFallback);
+            const match = await serwist.matchPrecache(fontFallback) || await cache.match(fontFallback);
             return match || Response.error();
         }
         return Response.error();
     };
-    setCatchHandler(handler);
+    serwist.setCatchHandler(handler);
 };
 
-const pageCache = ({ router = getSingletonRouter(), cacheName = "pages", matchCallback = ({ request })=>request.mode === "navigate", networkTimeoutSeconds = 3, plugins = [], warmCache } = {})=>{
+const pageCache = ({ serwist, cacheName = "pages", matchCallback = ({ request })=>request.mode === "navigate", networkTimeoutSeconds = 3, plugins = [], warmCache })=>{
     plugins.push(new CacheableResponsePlugin({
         statuses: [
             0,
@@ -103,7 +101,7 @@ const pageCache = ({ router = getSingletonRouter(), cacheName = "pages", matchCa
         cacheName,
         plugins
     });
-    router.registerCapture(matchCallback, strategy);
+    serwist.registerCapture(matchCallback, strategy);
     if (warmCache) {
         warmStrategyCache({
             urls: warmCache,
@@ -112,7 +110,7 @@ const pageCache = ({ router = getSingletonRouter(), cacheName = "pages", matchCa
     }
 };
 
-const staticResourceCache = ({ router = getSingletonRouter(), cacheName = "static-resources", matchCallback = ({ request })=>request.destination === "style" || request.destination === "script" || request.destination === "worker", plugins = [], warmCache } = {})=>{
+const staticResourceCache = ({ serwist, cacheName = "static-resources", matchCallback = ({ request })=>request.destination === "style" || request.destination === "script" || request.destination === "worker", plugins = [], warmCache })=>{
     plugins.push(new CacheableResponsePlugin({
         statuses: [
             0,
@@ -123,7 +121,7 @@ const staticResourceCache = ({ router = getSingletonRouter(), cacheName = "stati
         cacheName,
         plugins
     });
-    router.registerCapture(matchCallback, strategy);
+    serwist.registerCapture(matchCallback, strategy);
     if (warmCache) {
         warmStrategyCache({
             urls: warmCache,

package/dist/offlineFallback.d.ts

@@ -1,10 +1,9 @@
-import { type PrecacheController } from "@serwist/sw/precaching";
+import type { Serwist } from "serwist";
 export interface OfflineFallbackOptions {
     /**
-     * An optional `PrecacheController` instance. If not provided, the singleton
-     * `PrecacheController` will be used.
+     * Your `Serwist` instance.
      */
-    precacheController?: PrecacheController;
+    serwist: Serwist;
     /**
      * Precache name to match for page fallbacks. Defaults to offline.html.
      */
@@ -24,5 +23,5 @@ export interface OfflineFallbackOptions {
 
  * @param options
  */
-export declare const offlineFallback: ({ precacheController, pageFallback, imageFallback, fontFallback, }?: OfflineFallbackOptions) => void;
+export declare const offlineFallback: ({ serwist, pageFallback, imageFallback, fontFallback, }: OfflineFallbackOptions) => void;
 //# sourceMappingURL=offlineFallback.d.ts.map

package/dist/offlineFallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offlineFallback.d.ts","sourceRoot":"","sources":["../src/offlineFallback.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,kBAAkB,EAAkC,MAAM,wBAAwB,CAAC;AAGjG,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAKD;;;;;GAKG;AACH,eAAO,MAAM,eAAe,wEAKzB,sBAAsB,KAAQ,IAoChC,CAAC"}
+{"version":3,"file":"offlineFallback.d.ts","sourceRoot":"","sources":["../src/offlineFallback.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAA6C,OAAO,EAAE,MAAM,SAAS,CAAC;AAElF,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAKD;;;;;GAKG;AACH,eAAO,MAAM,eAAe,4DAKzB,sBAAsB,KAAG,IAoC3B,CAAC"}

package/dist/pageCache.d.ts

@@ -1,11 +1,10 @@
-import type { RouteMatchCallback, SerwistPlugin } from "@serwist/core";
-import { type Router } from "@serwist/sw/routing";
+import type { RouteMatchCallback, SerwistPlugin } from "serwist";
+import { Serwist } from "serwist";
 export interface PageCacheOptions {
     /**
-     * An optional `Router` instance. If not provided, the singleton `Router`
-     * will be used.
+     * Your `Serwist` instance.
      */
-    router?: Router;
+    serwist: Serwist;
     /**
      * Name for cache. Defaults to pages.
      */
@@ -34,5 +33,5 @@ export interface PageCacheOptions {
  *
  * @param options
  */
-export declare const pageCache: ({ router, cacheName, matchCallback, networkTimeoutSeconds, plugins, warmCache, }?: PageCacheOptions) => void;
+export declare const pageCache: ({ serwist, cacheName, matchCallback, networkTimeoutSeconds, plugins, warmCache, }: PageCacheOptions) => void;
 //# sourceMappingURL=pageCache.d.ts.map

package/dist/pageCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pageCache.d.ts","sourceRoot":"","sources":["../src/pageCache.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAA6B,aAAa,EAAE,MAAM,eAAe,CAAC;AAElG,OAAO,EAAE,KAAK,MAAM,EAAsB,MAAM,qBAAqB,CAAC;AAItE,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,sFAOnB,gBAAgB,KAAQ,IAoB1B,CAAC"}
+{"version":3,"file":"pageCache.d.ts","sourceRoot":"","sources":["../src/pageCache.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAA6B,aAAa,EAAE,MAAM,SAAS,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAKlC,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,sFAOnB,gBAAgB,KAAG,IAoBrB,CAAC"}

package/dist/staticResourceCache.d.ts

@@ -1,11 +1,10 @@
-import type { RouteMatchCallback, SerwistPlugin } from "@serwist/core";
-import { type Router } from "@serwist/sw/routing";
+import type { RouteMatchCallback, SerwistPlugin } from "serwist";
+import { Serwist } from "serwist";
 export interface StaticResourceOptions {
     /**
-     * An optional `Router` instance. If not provided, the singleton `Router`
-     * will be used.
+     * Your `Serwist` instance.
      */
-    router?: Router;
+    serwist: Serwist;
     /**
      * Name for cache.
      *
@@ -32,5 +31,5 @@ export interface StaticResourceOptions {
  *
  * @param options
  */
-export declare const staticResourceCache: ({ router, cacheName, matchCallback, plugins, warmCache, }?: StaticResourceOptions) => void;
+export declare const staticResourceCache: ({ serwist, cacheName, matchCallback, plugins, warmCache, }: StaticResourceOptions) => void;
 //# sourceMappingURL=staticResourceCache.d.ts.map

package/dist/staticResourceCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staticResourceCache.d.ts","sourceRoot":"","sources":["../src/staticResourceCache.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAA6B,aAAa,EAAE,MAAM,eAAe,CAAC;AAElG,OAAO,EAAE,KAAK,MAAM,EAAsB,MAAM,qBAAqB,CAAC;AAItE,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,+DAO7B,qBAAqB,KAAQ,IAkB/B,CAAC"}
+{"version":3,"file":"staticResourceCache.d.ts","sourceRoot":"","sources":["../src/staticResourceCache.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAA6B,aAAa,EAAE,MAAM,SAAS,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAKlC,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,+DAO7B,qBAAqB,KAAG,IAkB1B,CAAC"}

package/dist/warmStrategyCache.d.ts

@@ -1,4 +1,4 @@
-import type { Strategy } from "@serwist/sw/strategies";
+import type { Strategy } from "serwist/strategies";
 export interface WarmStrategyCacheOptions {
     /**
      * Paths to warm the strategy's cache with.

package/dist/warmStrategyCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"warmStrategyCache.d.ts","sourceRoot":"","sources":["../src/warmStrategyCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAKD;;GAEG;AACH,eAAO,MAAM,iBAAiB,YAAa,wBAAwB,KAAG,IAYrE,CAAC"}
+{"version":3,"file":"warmStrategyCache.d.ts","sourceRoot":"","sources":["../src/warmStrategyCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAKD;;GAEG;AACH,eAAO,MAAM,iBAAiB,YAAa,wBAAwB,KAAG,IAYrE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/recipes",
-  "version": "9.0.0-preview.21",
+  "version": "9.0.0-preview.24",
   "type": "module",
   "description": "A service worker helper library to manage common request and caching patterns",
   "files": [
@@ -30,13 +30,12 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@serwist/core": "9.0.0-preview.21",
-    "@serwist/sw": "9.0.0-preview.21"
+    "serwist": "9.0.0-preview.24"
   },
   "devDependencies": {
-    "rollup": "4.13.0",
-    "typescript": "5.5.0-dev.20240323",
-    "@serwist/constants": "9.0.0-preview.21"
+    "rollup": "4.14.0",
+    "typescript": "5.5.0-dev.20240404",
+    "@serwist/constants": "9.0.0-preview.24"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0"

package/src/googleFontsCache.ts

@@ -5,17 +5,15 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
-
-import { CacheableResponsePlugin, ExpirationPlugin } from "@serwist/sw/plugins";
-import { type Router, getSingletonRouter } from "@serwist/sw/routing";
-import { CacheFirst, StaleWhileRevalidate } from "@serwist/sw/strategies";
+import { Serwist } from "serwist";
+import { CacheableResponsePlugin, ExpirationPlugin } from "serwist/plugins";
+import { CacheFirst, StaleWhileRevalidate } from "serwist/strategies";
 
 export interface GoogleFontCacheOptions {
   /**
-   * An optional `Router` instance. If not provided, the singleton `Router`
-   * will be used.
+   * Your `Serwist` instance.
    */
-  router?: Router;
+  serwist: Serwist;
   /**
    * Cache prefix for caching stylesheets and webfonts. Defaults to google-fonts.
    */
@@ -36,13 +34,13 @@ export interface GoogleFontCacheOptions {
  * @param options
  */
 export const googleFontsCache = ({
-  router = getSingletonRouter(),
+  serwist,
   cachePrefix = "google-fonts",
   maxAgeSeconds = 60 * 60 * 24 * 365,
   maxEntries = 30,
-}: GoogleFontCacheOptions = {}): void => {
+}: GoogleFontCacheOptions): void => {
   // Cache the Google Fonts stylesheets with a stale-while-revalidate strategy.
-  router.registerCapture(
+  serwist.registerCapture(
     ({ url }) => url.origin === "https://fonts.googleapis.com",
     new StaleWhileRevalidate({
       cacheName: `${cachePrefix}-stylesheets`,
@@ -50,7 +48,7 @@ export const googleFontsCache = ({
   );
 
   // Cache the underlying font files with a cache-first strategy for 1 year.
-  router.registerCapture(
+  serwist.registerCapture(
     ({ url }) => url.origin === "https://fonts.gstatic.com",
     new CacheFirst({
       cacheName: `${cachePrefix}-webfonts`,

package/src/imageCache.ts

@@ -6,18 +6,17 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { RouteMatchCallback, RouteMatchCallbackOptions, SerwistPlugin } from "@serwist/core";
-import { CacheableResponsePlugin, ExpirationPlugin } from "@serwist/sw/plugins";
-import { type Router, getSingletonRouter } from "@serwist/sw/routing";
-import { CacheFirst } from "@serwist/sw/strategies";
+import type { RouteMatchCallback, RouteMatchCallbackOptions, SerwistPlugin } from "serwist";
+import { Serwist } from "serwist";
+import { CacheableResponsePlugin, ExpirationPlugin } from "serwist/plugins";
+import { CacheFirst } from "serwist/strategies";
 import { warmStrategyCache } from "./warmStrategyCache.js";
 
 export interface ImageCacheOptions {
   /**
-   * An optional `Router` instance. If not provided, the singleton `Router`
-   * will be used.
+   * Your `Serwist` instance.
    */
-  router?: Router;
+  serwist: Serwist;
   /**
    * Name for cache. Defaults to images.
    */
@@ -50,14 +49,14 @@ export interface ImageCacheOptions {
  * @param options
  */
 export const imageCache = ({
-  router = getSingletonRouter(),
+  serwist,
   cacheName = "images",
   matchCallback = ({ request }: RouteMatchCallbackOptions) => request.destination === "image",
   maxAgeSeconds = 30 * 24 * 60 * 60,
   maxEntries = 60,
   plugins = [],
   warmCache,
-}: ImageCacheOptions = {}): void => {
+}: ImageCacheOptions): void => {
   plugins.push(
     new CacheableResponsePlugin({
       statuses: [0, 200],
@@ -75,7 +74,7 @@ export const imageCache = ({
     plugins,
   });
 
-  router.registerCapture(matchCallback, strategy);
+  serwist.registerCapture(matchCallback, strategy);
 
   // Warms the cache
   if (warmCache) {

package/src/offlineFallback.ts

@@ -6,16 +6,13 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { RouteHandler, RouteHandlerCallbackOptions } from "@serwist/core";
-import { type PrecacheController, getSingletonPrecacheController } from "@serwist/sw/precaching";
-import { setCatchHandler } from "@serwist/sw/routing";
+import type { RouteHandler, RouteHandlerCallbackOptions, Serwist } from "serwist";
 
 export interface OfflineFallbackOptions {
   /**
-   * An optional `PrecacheController` instance. If not provided, the singleton
-   * `PrecacheController` will be used.
+   * Your `Serwist` instance.
    */
-  precacheController?: PrecacheController;
+  serwist: Serwist;
   /**
    * Precache name to match for page fallbacks. Defaults to offline.html.
    */
@@ -40,11 +37,11 @@ declare let self: ServiceWorkerGlobalScope;
  * @param options
  */
 export const offlineFallback = ({
-  precacheController = getSingletonPrecacheController(),
+  serwist,
   pageFallback = "offline.html",
   imageFallback,
   fontFallback,
-}: OfflineFallbackOptions = {}): void => {
+}: OfflineFallbackOptions): void => {
   self.addEventListener("install", (event) => {
     const files = [pageFallback];
     if (imageFallback) {
@@ -62,22 +59,22 @@ export const offlineFallback = ({
     const cache = await self.caches.open("serwist-offline-fallbacks");
 
     if (dest === "document") {
-      const match = (await precacheController.matchPrecache(pageFallback)) || (await cache.match(pageFallback));
+      const match = (await serwist.matchPrecache(pageFallback)) || (await cache.match(pageFallback));
       return match || Response.error();
     }
 
     if (dest === "image" && imageFallback !== undefined) {
-      const match = (await precacheController.matchPrecache(imageFallback)) || (await cache.match(imageFallback));
+      const match = (await serwist.matchPrecache(imageFallback)) || (await cache.match(imageFallback));
       return match || Response.error();
     }
 
     if (dest === "font" && fontFallback !== undefined) {
-      const match = (await precacheController.matchPrecache(fontFallback)) || (await cache.match(fontFallback));
+      const match = (await serwist.matchPrecache(fontFallback)) || (await cache.match(fontFallback));
       return match || Response.error();
     }
 
     return Response.error();
   };
 
-  setCatchHandler(handler);
+  serwist.setCatchHandler(handler);
 };

package/src/pageCache.ts

@@ -6,18 +6,17 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { RouteMatchCallback, RouteMatchCallbackOptions, SerwistPlugin } from "@serwist/core";
-import { CacheableResponsePlugin } from "@serwist/sw/plugins";
-import { type Router, getSingletonRouter } from "@serwist/sw/routing";
-import { NetworkFirst } from "@serwist/sw/strategies";
+import type { RouteMatchCallback, RouteMatchCallbackOptions, SerwistPlugin } from "serwist";
+import { Serwist } from "serwist";
+import { CacheableResponsePlugin } from "serwist/plugins";
+import { NetworkFirst } from "serwist/strategies";
 import { warmStrategyCache } from "./warmStrategyCache.js";
 
 export interface PageCacheOptions {
   /**
-   * An optional `Router` instance. If not provided, the singleton `Router`
-   * will be used.
+   * Your `Serwist` instance.
    */
-  router?: Router;
+  serwist: Serwist;
   /**
    * Name for cache. Defaults to pages.
    */
@@ -48,13 +47,13 @@ export interface PageCacheOptions {
  * @param options
  */
 export const pageCache = ({
-  router = getSingletonRouter(),
+  serwist,
   cacheName = "pages",
   matchCallback = ({ request }: RouteMatchCallbackOptions) => request.mode === "navigate",
   networkTimeoutSeconds = 3,
   plugins = [],
   warmCache,
-}: PageCacheOptions = {}): void => {
+}: PageCacheOptions): void => {
   plugins.push(
     new CacheableResponsePlugin({
       statuses: [0, 200],
@@ -68,7 +67,7 @@ export const pageCache = ({
   });
 
   // Registers the route
-  router.registerCapture(matchCallback, strategy);
+  serwist.registerCapture(matchCallback, strategy);
 
   // Warms the cache
   if (warmCache) {

package/src/staticResourceCache.ts

@@ -6,18 +6,17 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { RouteMatchCallback, RouteMatchCallbackOptions, SerwistPlugin } from "@serwist/core";
-import { CacheableResponsePlugin } from "@serwist/sw/plugins";
-import { type Router, getSingletonRouter } from "@serwist/sw/routing";
-import { StaleWhileRevalidate } from "@serwist/sw/strategies";
+import type { RouteMatchCallback, RouteMatchCallbackOptions, SerwistPlugin } from "serwist";
+import { Serwist } from "serwist";
+import { CacheableResponsePlugin } from "serwist/plugins";
+import { StaleWhileRevalidate } from "serwist/strategies";
 import { warmStrategyCache } from "./warmStrategyCache.js";
 
 export interface StaticResourceOptions {
   /**
-   * An optional `Router` instance. If not provided, the singleton `Router`
-   * will be used.
+   * Your `Serwist` instance.
    */
-  router?: Router;
+  serwist: Serwist;
   /**
    * Name for cache.
    *
@@ -46,13 +45,13 @@ export interface StaticResourceOptions {
  * @param options
  */
 export const staticResourceCache = ({
-  router = getSingletonRouter(),
+  serwist,
   cacheName = "static-resources",
   matchCallback = ({ request }: RouteMatchCallbackOptions) =>
     request.destination === "style" || request.destination === "script" || request.destination === "worker",
   plugins = [],
   warmCache,
-}: StaticResourceOptions = {}): void => {
+}: StaticResourceOptions): void => {
   plugins.push(
     new CacheableResponsePlugin({
       statuses: [0, 200],
@@ -64,7 +63,7 @@ export const staticResourceCache = ({
     plugins,
   });
 
-  router.registerCapture(matchCallback, strategy);
+  serwist.registerCapture(matchCallback, strategy);
 
   // Warms the cache
   if (warmCache) {

package/src/warmStrategyCache.ts

@@ -1,4 +1,4 @@
-import type { Strategy } from "@serwist/sw/strategies";
+import type { Strategy } from "serwist/strategies";
 
 export interface WarmStrategyCacheOptions {
   /**