@serwist/svelte 9.0.0-preview.9 → 9.0.0

package/dist/index.worker.d.ts

@@ -1,11 +1,14 @@
 /// <reference types="@sveltejs/kit" />
-import type { PrecacheEntry } from "@serwist/precaching";
-import type { RuntimeCaching } from "@serwist/sw";
-import { build as immutableAssets, files as staticAssets, prerendered as prerenderedRoutes, version as serviceWorkerVersion } from "$service-worker";
-export { immutableAssets, staticAssets, prerenderedRoutes, serviceWorkerVersion };
-export type StaticRevisions = {
+import type { PrecacheEntry, RuntimeCaching } from "serwist";
+import { base as basePath, build as immutableAssets, files as staticAssets, prerendered as prerenderedRoutes, version as serviceWorkerVersion } from "$service-worker";
+export { basePath, immutableAssets, staticAssets, prerenderedRoutes, serviceWorkerVersion };
+export type StaticRevisions = string | {
     [url: string]: string | null;
 };
+export type ManifestTransform = (manifest: PrecacheEntry[]) => {
+    manifest: PrecacheEntry[];
+    warnings?: string[] | undefined;
+};
 export interface GetPrecacheManifestOptions {
     /**
      * Whether immutable assets, as in assets that are generated by
@@ -28,25 +31,38 @@ export interface GetPrecacheManifestOptions {
      */
     precachePrerendered?: boolean;
     /**
-     * An object that maps URLs of static assets to custom `revision`'s.
-     * If an URL doesn't exist in the object, `$service-worker.version`
+     * A string revision used for all static assets or an object that maps
+     * URLs of static assets to custom revisions.
+     * If an URL doesn't exist in the object, `serviceWorkerVersion`
      * will be used instead.
      *
      * This helps prevent such assets, which are unlikely to change, from
-     * being invalidated every time the service worker is installed.
+     * being invalidated every time the service worker is rebuilt and updated.
      *
-     * Note: you should prefix these URLs with `$service-worker.base`.
+     * Note: you should prefix these URLs with `basePath`.
      */
     staticRevisions?: StaticRevisions;
+    /**
+     * One or more functions which will be applied sequentially against the
+     * generated manifest.
+     */
+    manifestTransforms?: ManifestTransform[];
 }
 /**
- * Retrieves the precache manifest generated by SvelteKit. If further
- * modifications are needed, simply mutate the resulting array.
+ * Retrieves the precache manifest generated by SvelteKit. A simple
+ * wrapper around SvelteKit's built-in service worker support. For more
+ * complex use cases, seek [the `@serwist/vite` recipe for SvelteKit](https://serwist.pages.dev/docs/vite/recipes/svelte-kit).
  *
  * @param options
  * @returns
  */
-export declare const getPrecacheManifest: ({ precacheImmutable, precacheStatic, precachePrerendered, staticRevisions, }?: GetPrecacheManifestOptions) => PrecacheEntry[];
+export declare const getPrecacheManifest: ({ precacheImmutable, precacheStatic, precachePrerendered, staticRevisions, manifestTransforms, }?: GetPrecacheManifestOptions) => PrecacheEntry[] | undefined;
 export declare const defaultIgnoreUrlParameters: RegExp[];
+/**
+ * The default, recommended list of caching strategies for applications
+ * built with SvelteKit.
+ *
+ * @see https://serwist.pages.dev/docs/svelte/worker-exports#default-cache
+ */
 export declare const defaultCache: RuntimeCaching[];
 //# 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":";AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,KAAK,IAAI,eAAe,EAAE,KAAK,IAAI,YAAY,EAAE,WAAW,IAAI,iBAAiB,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAErJ,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC;AAElF,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAE/D,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;;;;;OASG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,kFAK7B,0BAA0B,KAAQ,aAAa,EAajD,CAAC;AAEF,eAAO,MAAM,0BAA0B,UAAgC,CAAC;AAExE,eAAO,MAAM,YAAY,EAAE,cAAc,EAoGxC,CAAC"}
+{"version":3,"file":"index.worker.d.ts","sourceRoot":"","sources":["../src/index.worker.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAI7D,OAAO,EACL,IAAI,IAAI,QAAQ,EAChB,KAAK,IAAI,eAAe,EACxB,KAAK,IAAI,YAAY,EACrB,WAAW,IAAI,iBAAiB,EAChC,OAAO,IAAI,oBAAoB,EAChC,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC;AAE5F,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK;IAC7D,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;;;;;;OAUG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAC1C;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,sGAM7B,0BAA0B,KAAQ,aAAa,EAAE,GAAG,SA2CtD,CAAC;AAEF,eAAO,MAAM,0BAA0B,UAAgC,CAAC;AAExE;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,cAAc,EA8GpC,CAAC"}

package/dist/index.worker.js

@@ -1,17 +1,14 @@
-import { ExpirationPlugin } from '@serwist/expiration';
-import { CacheFirst, StaleWhileRevalidate, NetworkFirst } from '@serwist/strategies';
+import { CacheFirst, ExpirationPlugin, StaleWhileRevalidate, NetworkFirst } from 'serwist';
+import { logger } from 'serwist/internal';
 import { build, files, prerendered, version } from '$service-worker';
-export { build as immutableAssets, prerendered as prerenderedRoutes, version as serviceWorkerVersion, files as staticAssets } from '$service-worker';
+export { base as basePath, build as immutableAssets, prerendered as prerenderedRoutes, version as serviceWorkerVersion, files as staticAssets } from '$service-worker';
 
-const getPrecacheManifest = ({ precacheImmutable = true, precacheStatic = true, precachePrerendered = true, staticRevisions } = {})=>{
-    const staticMapper = (url)=>{
-        const revision = staticRevisions !== undefined && url in staticRevisions ? staticRevisions[url] : version;
-        return {
+const getPrecacheManifest = ({ precacheImmutable = true, precacheStatic = true, precachePrerendered = true, staticRevisions, manifestTransforms } = {})=>{
+    const staticMapper = (url)=>({
             url,
-            revision
-        };
-    };
-    return [
+            revision: typeof staticRevisions === "string" ? staticRevisions : typeof staticRevisions === "object" ? url in staticRevisions ? staticRevisions[url] : version : version
+        });
+    let precacheManifest = [
         ...precacheImmutable ? build.map((url)=>({
                 url,
                 revision: null
@@ -22,11 +19,34 @@ const getPrecacheManifest = ({ precacheImmutable = true, precacheStatic = true,
                 revision: version
             })) : []
     ];
+    if (manifestTransforms) {
+        const allWarnings = [];
+        for (const transform of manifestTransforms){
+            const result = transform(precacheManifest);
+            if (!("manifest" in result)) {
+                if (process.env.NODE_ENV !== "production") {
+                    logger.error("The return value from a manifestTransform should be an object with 'manifest' and optionally 'warnings' properties.");
+                }
+                return undefined;
+            }
+            precacheManifest = result.manifest;
+            allWarnings.push(...result.warnings || []);
+        }
+        if (process.env.NODE_ENV !== "production" && allWarnings.length > 0) {
+            logger.warn("Received warnings while transforming the precache manifest.");
+            logger.groupCollapsed("View details here.");
+            for (const warning of allWarnings){
+                logger.warn(warning);
+            }
+            logger.groupEnd();
+        }
+    }
+    return precacheManifest;
 };
 const defaultIgnoreUrlParameters = [
     /^x-sveltekit-invalidated$/
 ];
-const defaultCache = [
+const defaultCache = import.meta.env.DEV ? [] : [
     {
         matcher: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
         handler: new CacheFirst({
@@ -34,7 +54,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 4,
-                    maxAgeSeconds: 365 * 24 * 60 * 60
+                    maxAgeSeconds: 365 * 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -46,7 +67,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 4,
-                    maxAgeSeconds: 7 * 24 * 60 * 60
+                    maxAgeSeconds: 7 * 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -58,7 +80,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 64,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -70,7 +93,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 32,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -82,7 +106,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 32,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -94,7 +119,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 32,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -107,7 +133,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 16,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ],
             networkTimeoutSeconds: 10
@@ -120,7 +147,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 32,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ],
             networkTimeoutSeconds: 10

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@serwist/svelte",
-  "version": "9.0.0-preview.9",
+  "version": "9.0.0",
   "type": "module",
-  "description": "A module that integrates Serwist into your Svelte application.",
+  "description": "A module that complements SvelteKit's built-in service worker support.",
   "files": [
     "src",
     "dist"
@@ -22,7 +22,7 @@
   ],
   "author": "Serwist's Team",
   "license": "MIT",
-  "repository": "serwist/serwist",
+  "repository": "https://github.com/serwist/serwist",
   "bugs": "https://github.com/serwist/serwist/issues",
   "homepage": "https://serwist.pages.dev",
   "typesVersions": {
@@ -40,25 +40,18 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@serwist/expiration": "9.0.0-preview.9",
-    "@serwist/strategies": "9.0.0-preview.9"
+    "serwist": "9.0.0"
   },
   "devDependencies": {
-    "@sveltejs/kit": "2.5.0",
-    "rollup": "4.9.6",
-    "@serwist/constants": "9.0.0-preview.9",
-    "@serwist/precaching": "9.0.0-preview.9",
-    "@serwist/sw": "9.0.0-preview.9"
+    "@sveltejs/kit": "2.5.6",
+    "rollup": "4.14.3",
+    "@serwist/configs": "9.0.0"
   },
   "peerDependencies": {
     "@sveltejs/kit": ">=2.0.0",
-    "typescript": ">=5.0.0",
-    "@serwist/sw": "9.0.0-preview.9"
+    "typescript": ">=5.0.0"
   },
   "peerDependenciesMeta": {
-    "@serwist/sw": {
-      "optional": true
-    },
     "typescript": {
       "optional": true
     }

package/src/index.worker.ts

@@ -1,13 +1,23 @@
-import { ExpirationPlugin } from "@serwist/expiration";
-import type { PrecacheEntry } from "@serwist/precaching";
-import { CacheFirst, NetworkFirst, StaleWhileRevalidate } from "@serwist/strategies";
-import type { RuntimeCaching } from "@serwist/sw";
+import type { PrecacheEntry, RuntimeCaching } from "serwist";
+import { CacheFirst, ExpirationPlugin, NetworkFirst, StaleWhileRevalidate } from "serwist";
+import { logger } from "serwist/internal";
 
-import { build as immutableAssets, files as staticAssets, prerendered as prerenderedRoutes, version as serviceWorkerVersion } from "$service-worker";
+import {
+  base as basePath,
+  build as immutableAssets,
+  files as staticAssets,
+  prerendered as prerenderedRoutes,
+  version as serviceWorkerVersion,
+} from "$service-worker";
 
-export { immutableAssets, staticAssets, prerenderedRoutes, serviceWorkerVersion };
+export { basePath, immutableAssets, staticAssets, prerenderedRoutes, serviceWorkerVersion };
 
-export type StaticRevisions = { [url: string]: string | null };
+export type StaticRevisions = string | { [url: string]: string | null };
+
+export type ManifestTransform = (manifest: PrecacheEntry[]) => {
+  manifest: PrecacheEntry[];
+  warnings?: string[] | undefined;
+};
 
 export interface GetPrecacheManifestOptions {
   /**
@@ -31,21 +41,28 @@ export interface GetPrecacheManifestOptions {
    */
   precachePrerendered?: boolean;
   /**
-   * An object that maps URLs of static assets to custom `revision`'s.
-   * If an URL doesn't exist in the object, `$service-worker.version`
+   * A string revision used for all static assets or an object that maps
+   * URLs of static assets to custom revisions.
+   * If an URL doesn't exist in the object, `serviceWorkerVersion`
    * will be used instead.
    *
    * This helps prevent such assets, which are unlikely to change, from
-   * being invalidated every time the service worker is installed.
+   * being invalidated every time the service worker is rebuilt and updated.
    *
-   * Note: you should prefix these URLs with `$service-worker.base`.
+   * Note: you should prefix these URLs with `basePath`.
    */
   staticRevisions?: StaticRevisions;
+  /**
+   * One or more functions which will be applied sequentially against the
+   * generated manifest.
+   */
+  manifestTransforms?: ManifestTransform[];
 }
 
 /**
- * Retrieves the precache manifest generated by SvelteKit. If further
- * modifications are needed, simply mutate the resulting array.
+ * Retrieves the precache manifest generated by SvelteKit. A simple
+ * wrapper around SvelteKit's built-in service worker support. For more
+ * complex use cases, seek [the `@serwist/vite` recipe for SvelteKit](https://serwist.pages.dev/docs/vite/recipes/svelte-kit).
  *
  * @param options
  * @returns
@@ -55,121 +72,168 @@ export const getPrecacheManifest = ({
   precacheStatic = true,
   precachePrerendered = true,
   staticRevisions,
-}: GetPrecacheManifestOptions = {}): PrecacheEntry[] => {
-  const staticMapper = (url: string): PrecacheEntry => {
-    const revision = staticRevisions !== undefined && url in staticRevisions ? staticRevisions[url] : serviceWorkerVersion;
-    return { url, revision };
-  };
-  return [
+  manifestTransforms,
+}: GetPrecacheManifestOptions = {}): PrecacheEntry[] | undefined => {
+  const staticMapper = (url: string): PrecacheEntry => ({
+    url,
+    revision:
+      typeof staticRevisions === "string"
+        ? staticRevisions
+        : typeof staticRevisions === "object"
+          ? url in staticRevisions
+            ? staticRevisions[url]
+            : serviceWorkerVersion
+          : serviceWorkerVersion,
+  });
+  let precacheManifest: PrecacheEntry[] = [
     // Immutable files generated by Vite.
-    ...(precacheImmutable ? immutableAssets.map((url) => ({ url, revision: null }) satisfies PrecacheEntry) : []),
+    ...(precacheImmutable ? immutableAssets.map((url) => <PrecacheEntry>{ url, revision: null }) : []),
     // Files in the static directory.
     ...(precacheStatic ? staticAssets.map(staticMapper) : []),
     // Prerendered routes.
-    ...(precachePrerendered ? prerenderedRoutes.map((url) => ({ url, revision: serviceWorkerVersion }) satisfies PrecacheEntry) : []),
+    ...(precachePrerendered ? prerenderedRoutes.map((url) => <PrecacheEntry>{ url, revision: serviceWorkerVersion }) : []),
   ];
+  if (manifestTransforms) {
+    const allWarnings: string[] = [];
+    for (const transform of manifestTransforms) {
+      const result = transform(precacheManifest);
+      if (!("manifest" in result)) {
+        if (process.env.NODE_ENV !== "production") {
+          logger.error("The return value from a manifestTransform should be an object with 'manifest' and optionally 'warnings' properties.");
+        }
+        return undefined;
+      }
+      precacheManifest = result.manifest;
+      allWarnings.push(...(result.warnings || []));
+    }
+    if (process.env.NODE_ENV !== "production" && allWarnings.length > 0) {
+      logger.warn("Received warnings while transforming the precache manifest.");
+      logger.groupCollapsed("View details here.");
+      for (const warning of allWarnings) {
+        logger.warn(warning);
+      }
+      logger.groupEnd();
+    }
+  }
+  return precacheManifest;
 };
 
 export const defaultIgnoreUrlParameters = [/^x-sveltekit-invalidated$/];
 
-export const defaultCache: RuntimeCaching[] = [
-  {
-    matcher: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
-    handler: new CacheFirst({
-      cacheName: "google-fonts",
-      plugins: [
-        new ExpirationPlugin({
-          maxEntries: 4,
-          maxAgeSeconds: 365 * 24 * 60 * 60, // 365 days
+/**
+ * The default, recommended list of caching strategies for applications
+ * built with SvelteKit.
+ *
+ * @see https://serwist.pages.dev/docs/svelte/worker-exports#default-cache
+ */
+export const defaultCache: RuntimeCaching[] = import.meta.env.DEV
+  ? []
+  : [
+      {
+        matcher: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
+        handler: new CacheFirst({
+          cacheName: "google-fonts",
+          plugins: [
+            new ExpirationPlugin({
+              maxEntries: 4,
+              maxAgeSeconds: 365 * 24 * 60 * 60, // 365 days
+              maxAgeFrom: "last-used",
+            }),
+          ],
         }),
-      ],
-    }),
-  },
-  {
-    matcher: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
-    handler: new StaleWhileRevalidate({
-      cacheName: "static-font-assets",
-      plugins: [
-        new ExpirationPlugin({
-          maxEntries: 4,
-          maxAgeSeconds: 7 * 24 * 60 * 60, // 7 days
+      },
+      {
+        matcher: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
+        handler: new StaleWhileRevalidate({
+          cacheName: "static-font-assets",
+          plugins: [
+            new ExpirationPlugin({
+              maxEntries: 4,
+              maxAgeSeconds: 7 * 24 * 60 * 60, // 7 days
+              maxAgeFrom: "last-used",
+            }),
+          ],
         }),
-      ],
-    }),
-  },
-  {
-    matcher: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
-    handler: new StaleWhileRevalidate({
-      cacheName: "static-image-assets",
-      plugins: [
-        new ExpirationPlugin({
-          maxEntries: 64,
-          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+      },
+      {
+        matcher: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
+        handler: new StaleWhileRevalidate({
+          cacheName: "static-image-assets",
+          plugins: [
+            new ExpirationPlugin({
+              maxEntries: 64,
+              maxAgeSeconds: 24 * 60 * 60, // 24 hours
+              maxAgeFrom: "last-used",
+            }),
+          ],
         }),
-      ],
-    }),
-  },
-  {
-    matcher: /\.(?:js)$/i,
-    handler: new StaleWhileRevalidate({
-      cacheName: "static-js-assets",
-      plugins: [
-        new ExpirationPlugin({
-          maxEntries: 32,
-          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+      },
+      {
+        matcher: /\.(?:js)$/i,
+        handler: new StaleWhileRevalidate({
+          cacheName: "static-js-assets",
+          plugins: [
+            new ExpirationPlugin({
+              maxEntries: 32,
+              maxAgeSeconds: 24 * 60 * 60, // 24 hours
+              maxAgeFrom: "last-used",
+            }),
+          ],
         }),
-      ],
-    }),
-  },
-  {
-    matcher: /\.(?:css|less)$/i,
-    handler: new StaleWhileRevalidate({
-      cacheName: "static-style-assets",
-      plugins: [
-        new ExpirationPlugin({
-          maxEntries: 32,
-          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+      },
+      {
+        matcher: /\.(?:css|less)$/i,
+        handler: new StaleWhileRevalidate({
+          cacheName: "static-style-assets",
+          plugins: [
+            new ExpirationPlugin({
+              maxEntries: 32,
+              maxAgeSeconds: 24 * 60 * 60, // 24 hours
+              maxAgeFrom: "last-used",
+            }),
+          ],
         }),
-      ],
-    }),
-  },
-  {
-    matcher: /\.(?:json|xml|csv)$/i,
-    handler: new NetworkFirst({
-      cacheName: "static-data-assets",
-      plugins: [
-        new ExpirationPlugin({
-          maxEntries: 32,
-          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+      },
+      {
+        matcher: /\.(?:json|xml|csv)$/i,
+        handler: new NetworkFirst({
+          cacheName: "static-data-assets",
+          plugins: [
+            new ExpirationPlugin({
+              maxEntries: 32,
+              maxAgeSeconds: 24 * 60 * 60, // 24 hours
+              maxAgeFrom: "last-used",
+            }),
+          ],
         }),
-      ],
-    }),
-  },
-  {
-    matcher: /\/api\/.*$/i,
-    method: "GET",
-    handler: new NetworkFirst({
-      cacheName: "apis",
-      plugins: [
-        new ExpirationPlugin({
-          maxEntries: 16,
-          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+      },
+      {
+        matcher: /\/api\/.*$/i,
+        method: "GET",
+        handler: new NetworkFirst({
+          cacheName: "apis",
+          plugins: [
+            new ExpirationPlugin({
+              maxEntries: 16,
+              maxAgeSeconds: 24 * 60 * 60, // 24 hours
+              maxAgeFrom: "last-used",
+            }),
+          ],
+          networkTimeoutSeconds: 10, // fallback to cache if API does not response within 10 seconds
         }),
-      ],
-      networkTimeoutSeconds: 10, // fallback to cache if API does not response within 10 seconds
-    }),
-  },
-  {
-    matcher: /.*/i,
-    handler: new NetworkFirst({
-      cacheName: "others",
-      plugins: [
-        new ExpirationPlugin({
-          maxEntries: 32,
-          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+      },
+      {
+        matcher: /.*/i,
+        handler: new NetworkFirst({
+          cacheName: "others",
+          plugins: [
+            new ExpirationPlugin({
+              maxEntries: 32,
+              maxAgeSeconds: 24 * 60 * 60, // 24 hours
+              maxAgeFrom: "last-used",
+            }),
+          ],
+          networkTimeoutSeconds: 10,
         }),
-      ],
-      networkTimeoutSeconds: 10,
-    }),
-  },
-];
+      },
+    ];