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

package/dist/chunks/schema.js

@@ -0,0 +1,20 @@
+import { requiredSwDestPartial } from '@serwist/build/schema';
+import { injectManifestOptions as injectManifestOptions$1 } from '@serwist/webpack-plugin/schema';
+import { z } from 'zod';
+
+const injectPartial = z.object({
+    cacheOnNavigation: z.boolean().default(false),
+    disable: z.boolean().default(false),
+    register: z.boolean().default(true),
+    reloadOnOnline: z.boolean().default(true),
+    scope: z.string().optional(),
+    swUrl: z.string().default("/sw.js"),
+    globPublicPatterns: z.array(z.string()).default([
+        "**/*"
+    ])
+}).strict("Do not pass invalid properties to NextInjectManifestPartial!");
+const injectManifestOptions = injectManifestOptions$1.merge(requiredSwDestPartial).merge(injectPartial).omit({
+    disablePrecacheManifest: true
+}).strict("Do not pass invalid properties to NextInjectManifestOptions!");
+
+export { injectManifestOptions as a, injectPartial as i };

package/dist/index.d.ts

@@ -1,6 +1,13 @@
-import type { NextInjectManifestOptions } from "@serwist/build";
 import type { NextConfig } from "next";
-declare const withSerwistInit: (pluginOptions: NextInjectManifestOptions) => (nextConfig?: NextConfig) => NextConfig;
+import type { InjectManifestOptions, InjectManifestOptionsComplete } from "./lib/types.js";
+import { validateInjectManifestOptions } from "./lib/validator.js";
+/**
+ * Integrates Serwist into your Next.js app.
+ * @param userOptions
+ * @returns
+ */
+declare const withSerwistInit: (userOptions: InjectManifestOptions) => (nextConfig?: NextConfig) => NextConfig;
 export default withSerwistInit;
-export type { NextInjectManifestOptions as PluginOptions };
+export { validateInjectManifestOptions };
+export type { InjectManifestOptions as PluginOptions, InjectManifestOptionsComplete as PluginOptionsComplete };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAMhE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAQvC,QAAA,MAAM,eAAe,kBAAmB,yBAAyB,mBAAkB,UAAU,KAAK,UA4NjG,CAAC;AAEF,eAAe,eAAe,CAAC;AAC/B,YAAY,EAAE,yBAAyB,IAAI,aAAa,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAInE;;;;GAIG;AACH,QAAA,MAAM,eAAe,gBAAiB,qBAAqB,mBAAkB,UAAU,KAAK,UAwN3F,CAAC;AAEF,eAAe,eAAe,CAAC;AAC/B,OAAO,EAAE,6BAA6B,EAAE,CAAC;AACzC,YAAY,EAAE,qBAAqB,IAAI,aAAa,EAAE,6BAA6B,IAAI,qBAAqB,EAAE,CAAC"}

package/dist/index.js

@@ -1,14 +1,16 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { validateNextInjectManifestOptions } from '@serwist/build/next';
 import { InjectManifest } from '@serwist/webpack-plugin';
 import { ChildCompilationPlugin, relativeToOutputPath } from '@serwist/webpack-plugin/internal';
-import { CleanWebpackPlugin } from 'clean-webpack-plugin';
-import fg from 'fast-glob';
+import { globSync } from 'glob';
 import crypto from 'node:crypto';
-import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import chalk from 'chalk';
+import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
+import { a as injectManifestOptions } from './chunks/schema.js';
+import '@serwist/webpack-plugin/schema';
+import 'zod';
 
 const findFirstTruthy = (arr, fn)=>{
     for (const i of arr){
@@ -83,8 +85,21 @@ const event = (...message)=>{
     prefixedLog("event", ...message);
 };
 
+const validateInjectManifestOptions = (input)=>{
+    const result = injectManifestOptions.safeParse(input, {
+        errorMap: validationErrorMap
+    });
+    if (!result.success) {
+        throw new SerwistConfigError({
+            moduleName: "@serwist/next",
+            message: JSON.stringify(result.error.format(), null, 2)
+        });
+    }
+    return result.data;
+};
+
 const __dirname = fileURLToPath(new URL(".", import.meta.url));
-const withSerwistInit = (pluginOptions)=>{
+const withSerwistInit = (userOptions)=>{
     return (nextConfig = {})=>({
             ...nextConfig,
             webpack (config, options) {
@@ -92,7 +107,7 @@ const withSerwistInit = (pluginOptions)=>{
                 const { dev } = options;
                 const basePath = options.config.basePath || "/";
                 const tsConfigJson = loadTSConfig(options.dir, nextConfig?.typescript?.tsconfigPath);
-                const { cacheOnNavigation, disable, scope = basePath, swUrl, register, reloadOnOnline, globPublicPatterns, ...buildOptions } = validateNextInjectManifestOptions(pluginOptions);
+                const { cacheOnNavigation, disable, scope = basePath, swUrl, register, reloadOnOnline, globPublicPatterns, ...buildOptions } = validateInjectManifestOptions(userOptions);
                 if (typeof nextConfig.webpack === "function") {
                     config = nextConfig.webpack(config, options);
                 }
@@ -144,7 +159,7 @@ const withSerwistInit = (pluginOptions)=>{
                         info("Service worker won't be automatically registered as per the config, please call the following code in componentDidMount or useEffect:");
                         info("  window.serwist.register()");
                         if (!tsConfigJson?.compilerOptions?.types?.includes("@serwist/next/typings")) {
-                            info("You may also want to add @serwist/next/typings to compilerOptions.types in your tsconfig.json/jsconfig.json.");
+                            info("You may also want to add '@serwist/next/typings' to compilerOptions.types in your tsconfig.json/jsconfig.json.");
                         }
                     }
                     const { swSrc: userSwSrc, swDest: userSwDest, additionalPrecacheEntries, exclude, manifestTransforms = [], ...otherBuildOptions } = buildOptions;
@@ -157,7 +172,24 @@ const withSerwistInit = (pluginOptions)=>{
                         swDest = path.join(options.dir, swDest);
                     }
                     const publicDir = path.resolve(options.dir, "public");
-                    const destDir = path.dirname(swDest);
+                    const { dir: destDir, base: destBase } = path.parse(swDest);
+                    const cleanUpList = globSync([
+                        "swe-worker-*.js",
+                        "swe-worker-*.js.map",
+                        destBase,
+                        `${destBase}.map`
+                    ], {
+                        absolute: true,
+                        nodir: true,
+                        cwd: destDir
+                    });
+                    for (const file of cleanUpList){
+                        fs.rm(file, {
+                            force: true
+                        }, (err)=>{
+                            if (err) throw err;
+                        });
+                    }
                     const shouldBuildSWEntryWorker = cacheOnNavigation;
                     let swEntryPublicPath = undefined;
                     let swEntryWorkerDest = undefined;
@@ -177,29 +209,16 @@ const withSerwistInit = (pluginOptions)=>{
                     info(`Service worker: ${swDest}`);
                     info(`  URL: ${_sw}`);
                     info(`  Scope: ${_scope}`);
-                    config.plugins.push(new CleanWebpackPlugin({
-                        cleanOnceBeforeBuildPatterns: [
-                            path.join(destDir, "swe-worker-*.js"),
-                            path.join(destDir, "swe-worker-*.js.map"),
-                            swDest
-                        ]
-                    }));
                     let resolvedManifestEntries = additionalPrecacheEntries;
                     if (!resolvedManifestEntries) {
-                        const swDestFileName = path.basename(swDest);
-                        const userPublicGlob = typeof globPublicPatterns === "string" ? [
-                            globPublicPatterns
-                        ] : globPublicPatterns ?? [
-                            "**/*"
-                        ];
-                        const publicScan = fg.sync([
-                            ...userPublicGlob,
-                            "!swe-worker-*.js",
-                            "!swe-worker-*.js.map",
-                            `!${swDestFileName.replace(/^\/+/, "")}`,
-                            `!${swDestFileName.replace(/^\/+/, "")}.map`
-                        ], {
-                            cwd: publicDir
+                        const publicScan = globSync(globPublicPatterns, {
+                            nodir: true,
+                            cwd: publicDir,
+                            ignore: [
+                                "swe-worker-*.js",
+                                destBase,
+                                `${destBase}.map`
+                            ]
                         });
                         resolvedManifestEntries = publicScan.map((f)=>({
                                 url: path.posix.join(basePath, f),
@@ -247,4 +266,4 @@ const withSerwistInit = (pluginOptions)=>{
         });
 };
 
-export { withSerwistInit as default };
+export { withSerwistInit as default, validateInjectManifestOptions };

package/dist/index.schema.d.ts

@@ -0,0 +1,3 @@
+import { injectManifestOptions, injectPartial } from "./lib/schema.js";
+export { injectPartial, injectManifestOptions };
+//# sourceMappingURL=index.schema.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.schema.d.ts","sourceRoot":"","sources":["../src/index.schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,CAAC"}

package/dist/index.schema.js

@@ -0,0 +1,4 @@
+export { a as injectManifestOptions, i as injectPartial } from './chunks/schema.js';
+import '@serwist/build/schema';
+import '@serwist/webpack-plugin/schema';
+import 'zod';

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,163 +1,173 @@
-const nonNullable = (value)=>value !== null && value !== undefined;
+import { ExpirationPlugin, RangeRequestsPlugin } from '@serwist/sw/plugins';
+import { CacheFirst, StaleWhileRevalidate, NetworkFirst } from '@serwist/sw/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 = [
+const defaultCache = process.env.NODE_ENV !== "production" ? [] : [
     {
-        urlPattern: /^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,
-        handler: "CacheFirst",
-        options: {
+        matcher: /^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,
+        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,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        matcher: /^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,
+        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,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        matcher: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
+        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,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        matcher: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
+        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,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\/_next\/static.+\.js$/i,
-        handler: "CacheFirst",
-        options: {
+        matcher: /\/_next\/static.+\.js$/i,
+        handler: new CacheFirst({
             cacheName: "next-static-js-assets",
-            expiration: {
-                maxEntries: 64,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 64,
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\/_next\/image\?url=.+$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        matcher: /\/_next\/image\?url=.+$/i,
+        handler: new StaleWhileRevalidate({
             cacheName: "next-image",
-            expiration: {
-                maxEntries: 64,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 64,
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\.(?:mp3|wav|ogg)$/i,
-        handler: "CacheFirst",
-        options: {
-            rangeRequests: true,
+        matcher: /\.(?:mp3|wav|ogg)$/i,
+        handler: new CacheFirst({
             cacheName: "static-audio-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
+                }),
+                new RangeRequestsPlugin()
+            ]
+        })
     },
     {
-        urlPattern: /\.(?:mp4|webm)$/i,
-        handler: "CacheFirst",
-        options: {
-            rangeRequests: true,
+        matcher: /\.(?:mp4|webm)$/i,
+        handler: new CacheFirst({
             cacheName: "static-video-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
+                }),
+                new RangeRequestsPlugin()
+            ]
+        })
     },
     {
-        urlPattern: /\.(?:js)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        matcher: /\.(?:js)$/i,
+        handler: new StaleWhileRevalidate({
             cacheName: "static-js-assets",
-            expiration: {
-                maxEntries: 48,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 48,
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\.(?:css|less)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        matcher: /\.(?:css|less)$/i,
+        handler: new StaleWhileRevalidate({
             cacheName: "static-style-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\/_next\/data\/.+\/.+\.json$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        matcher: /\/_next\/data\/.+\/.+\.json$/i,
+        handler: new NetworkFirst({
             cacheName: "next-data",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\.(?:json|xml|csv)$/i,
-        handler: "NetworkFirst",
-        options: {
+        matcher: /\.(?:json|xml|csv)$/i,
+        handler: new NetworkFirst({
             cacheName: "static-data-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
+                })
+            ]
+        })
     },
     {
-        urlPattern: ({ sameOrigin, url: { pathname } })=>{
+        matcher: ({ sameOrigin, url: { pathname } })=>{
             if (!sameOrigin || pathname.startsWith("/api/auth/callback")) {
                 return false;
             }
@@ -166,72 +176,80 @@ 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,
+                    maxAgeFrom: "last-used"
+                })
+            ],
             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: {
+        })
+    },
+    {
+        matcher: ({ 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: {
+                })
+            ]
+        })
+    },
+    {
+        matcher: ({ 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: {
+                })
+            ]
+        })
+    },
+    {
+        matcher: ({ 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: {
+        matcher: ({ url: { pathname }, sameOrigin })=>sameOrigin && !pathname.startsWith("/api/"),
+        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: {
+        matcher: ({ sameOrigin })=>!sameOrigin,
+        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/lib/find-first-truthy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-first-truthy.d.ts","sourceRoot":"","sources":["../../src/lib/find-first-truthy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,eAAe,cAAe,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC,+BAQhE,CAAC"}

package/dist/lib/get-content-hash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-content-hash.d.ts","sourceRoot":"","sources":["../../src/lib/get-content-hash.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAI9B,eAAO,MAAM,cAAc,SAAU,GAAG,oBAAoB,SAAS,OAAO,WAK3E,CAAC"}

package/dist/lib/get-file-hash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-file-hash.d.ts","sourceRoot":"","sources":["../../src/lib/get-file-hash.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,eAAO,MAAM,WAAW,SAAU,GAAG,oBAAoB,WAAyE,CAAC"}

package/dist/lib/get-package-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-package-version.d.ts","sourceRoot":"","sources":["../../src/lib/get-package-version.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,gBAAiB,MAAM,KAAG,MAAM,GAAG,SAMhE,CAAC"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC"}

package/dist/lib/load-tsconfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-tsconfig.d.ts","sourceRoot":"","sources":["../../src/lib/load-tsconfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9D,eAAO,MAAM,YAAY,YAAa,MAAM,wBAAwB,MAAM,GAAG,SAAS,KAAG,YAAY,GAAG,SAmBvG,CAAC"}