@serwist/vite 9.0.0-preview.9 → 9.0.1

package/dist/chunks/schema.js

@@ -0,0 +1,56 @@
+import { basePartial, globPartial, injectPartial, requiredSwDestPartial, requiredGlobDirectoryPartial } from '@serwist/build/schema';
+import { z } from 'zod';
+
+const hooks = z.object({
+    beforeBuildServiceWorker: z.function(z.tuple([
+        z.any()
+    ]), z.union([
+        z.promise(z.void()),
+        z.void()
+    ])).optional(),
+    closeBundleOrder: z.union([
+        z.literal("pre"),
+        z.literal("post"),
+        z.null()
+    ]).optional(),
+    configureOptions: z.function(z.tuple([
+        z.any(),
+        z.any()
+    ]), z.union([
+        z.promise(z.void()),
+        z.void()
+    ])).optional()
+});
+const devOptions = z.object({
+    bundle: z.boolean().default(true),
+    minify: z.union([
+        z.boolean(),
+        z.literal("terser"),
+        z.literal("esbuild")
+    ]).default(false)
+});
+const injectManifestPartial = z.object({
+    mode: z.union([
+        z.literal("development"),
+        z.literal("production")
+    ]),
+    type: z.union([
+        z.literal("classic"),
+        z.literal("module")
+    ]).default("classic"),
+    scope: z.string(),
+    base: z.string(),
+    disable: z.boolean().default(false),
+    integration: hooks.default({}),
+    swUrl: z.string().default("/sw.js"),
+    plugins: z.array(z.any()).default([]),
+    rollupFormat: z.union([
+        z.literal("es"),
+        z.literal("iife")
+    ]).default("es"),
+    rollupOptions: z.record(z.string(), z.any()).default({}),
+    devOptions: devOptions.default({})
+});
+const injectManifestOptions = basePartial.merge(globPartial).merge(injectPartial).merge(requiredSwDestPartial).merge(requiredGlobDirectoryPartial).merge(injectManifestPartial).strict("Do not pass invalid properties to InjectManifestOptions!");
+
+export { devOptions, hooks, injectManifestOptions, injectManifestPartial };

package/dist/index.d.ts

@@ -1,18 +1,19 @@
 import type { Plugin } from "vite";
-import { createApi } from "./api.js";
-import { createContext } from "./context.js";
+import { createApi } from "./lib/api.js";
+import { createContext } from "./lib/context.js";
+import type { DevOptions, ExtendManifestEntriesHook, Hooks, PluginOptions, PluginOptionsComplete, SerwistViteApi } from "./lib/types.js";
+import { resolveEntry, toFs } from "./lib/utils.js";
+import { validateInjectManifestOptions } from "./lib/validator.js";
 import { buildPlugin } from "./plugins/build.js";
 import { devPlugin } from "./plugins/dev.js";
 import { mainPlugin } from "./plugins/main.js";
-import type { PluginOptions } from "./types.js";
-import { resolveEntry, toFs } from "./utils.js";
 /**
  * Integrates Serwist into your Vite app.
  * @param userOptions
  * @returns
  */
 export declare const serwist: (userOptions: PluginOptions) => Plugin[];
-export { buildPlugin as build, createApi, createContext, devPlugin as dev, mainPlugin as main, resolveEntry, toFs };
-export type { SerwistViteContext } from "./context.js";
-export * from "./types.js";
+export { buildPlugin as build, createApi, createContext, devPlugin as dev, mainPlugin as main, resolveEntry, toFs, validateInjectManifestOptions };
+export type { SerwistViteContext } from "./lib/context.js";
+export type { PluginOptions, PluginOptionsComplete, Hooks, ExtendManifestEntriesHook, DevOptions, SerwistViteApi };
 //# 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":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;GAIG;AACH,eAAO,MAAM,OAAO,gBAAiB,aAAa,KAAG,MAAM,EAI1D,CAAC;AAGF,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,IAAI,GAAG,EAAE,UAAU,IAAI,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;AACpH,YAAY,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACzI,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C;;;;GAIG;AACH,eAAO,MAAM,OAAO,gBAAiB,aAAa,KAAG,MAAM,EAI1D,CAAC;AAGF,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,IAAI,GAAG,EAAE,UAAU,IAAI,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,6BAA6B,EAAE,CAAC;AACnJ,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC"}

package/dist/index.js

@@ -1,68 +1,13 @@
+import { cyan, green, dim, yellow } from 'kolorist';
 import assert from 'node:assert';
 import fs from 'node:fs/promises';
-import path, { resolve } from 'node:path';
-import { normalizePath } from 'vite';
+import path from 'node:path';
 import fs$1 from 'node:fs';
-import process$1 from 'node:process';
-import crypto from 'node:crypto';
-import fg from 'fast-glob';
-
-let enabled = true;
-const globalVar = typeof self !== 'undefined' ? self : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : {};
-let supportLevel = 0;
-if (globalVar.process && globalVar.process.env && globalVar.process.stdout) {
-    const { FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM, COLORTERM } = globalVar.process.env;
-    if (NODE_DISABLE_COLORS || NO_COLOR || FORCE_COLOR === '0') {
-        enabled = false;
-    } else if (FORCE_COLOR === '1' || FORCE_COLOR === '2' || FORCE_COLOR === '3') {
-        enabled = true;
-    } else if (TERM === 'dumb') {
-        enabled = false;
-    } else if ('CI' in globalVar.process.env && [
-        'TRAVIS',
-        'CIRCLECI',
-        'APPVEYOR',
-        'GITLAB_CI',
-        'GITHUB_ACTIONS',
-        'BUILDKITE',
-        'DRONE'
-    ].some((vendor)=>vendor in globalVar.process.env)) {
-        enabled = true;
-    } else {
-        enabled = process.stdout.isTTY;
-    }
-    if (enabled) {
-        if (process.platform === 'win32') {
-            supportLevel = 3;
-        } else {
-            if (COLORTERM && (COLORTERM === 'truecolor' || COLORTERM === '24bit')) {
-                supportLevel = 3;
-            } else if (TERM && (TERM.endsWith('-256color') || TERM.endsWith('256'))) {
-                supportLevel = 2;
-            } else {
-                supportLevel = 1;
-            }
-        }
-    }
-}
-let options = {
-    enabled,
-    supportLevel
-};
-function kolorist(start, end, level = 1) {
-    const open = `\x1b[${start}m`;
-    const close = `\x1b[${end}m`;
-    const regex = new RegExp(`\\x1b\\[${end}m`, 'g');
-    return (str)=>{
-        return options.enabled && options.supportLevel >= level ? open + ('' + str).replace(regex, open) + close : '' + str;
-    };
-}
-const dim = kolorist(2, 22);
-const green = kolorist(32, 39);
-const yellow = kolorist(33, 39);
-const cyan = kolorist(36, 39);
+import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
+import { normalizePath } from 'vite';
+import process from 'node:process';
 
-var version = "9.0.0-preview.9";
+var version = "9.0.1";
 
 const logSerwistResult = (buildResult, viteOptions)=>{
     const { logLevel = "info" } = viteOptions;
@@ -89,9 +34,8 @@ const loadSerwistBuild = async ()=>{
         return require("@serwist/build");
     }
 };
-const injectManifest = async (config)=>{
-    const { validateViteInjectManifestOptions, getFileManifestEntries, stringify } = await loadSerwistBuild();
-    const options = await validateViteInjectManifestOptions(config);
+const injectManifest = async (options)=>{
+    const { getFileManifestEntries, stringify } = await loadSerwistBuild();
     const { count, size, manifestEntries, warnings } = await getFileManifestEntries(options);
     const manifestString = manifestEntries === undefined ? "undefined" : stringify(manifestEntries);
     return {
@@ -103,7 +47,7 @@ const injectManifest = async (config)=>{
     };
 };
 const generateServiceWorker = async (ctx)=>{
-    const { format, plugins, rollupOptions } = ctx.options.injectManifestRollupOptions;
+    const { plugins, rollupOptions, rollupFormat } = ctx.options;
     const parsedSwDest = path.parse(ctx.options.injectManifest.swDest);
     let injectManifestResult = undefined;
     if (ctx.options.injectManifest.injectionPoint) {
@@ -189,7 +133,7 @@ const generateServiceWorker = async (ctx)=>{
                     entry: ctx.options.injectManifest.swSrc,
                     name: "app",
                     formats: [
-                        format
+                        rollupFormat
                     ]
                 },
                 rollupOptions: {
@@ -254,26 +198,6 @@ const createContext = (userOptions, framework)=>{
     };
 };
 
-const buildPlugin = (ctx, api)=>{
-    return {
-        name: "@serwist/vite:build",
-        enforce: "post",
-        apply: "build",
-        closeBundle: {
-            sequential: true,
-            order: ctx.userOptions?.integration?.closeBundleOrder,
-            async handler () {
-                if (!ctx.viteConfig.build.ssr && !ctx.options.disable) {
-                    await api.generateSW();
-                }
-            }
-        },
-        async buildEnd (error) {
-            if (error) throw error;
-        }
-    };
-};
-
 const slash = (str)=>{
     return str.replace(/\\/g, "/");
 };
@@ -306,6 +230,39 @@ const toFs = (str)=>{
     return `/@fs${str.startsWith("/") ? "" : "/"}${str}`;
 };
 
+const validateInjectManifestOptions = async (input)=>{
+    const result = await (await import('./chunks/schema.js')).injectManifestOptions.spa(input, {
+        errorMap: validationErrorMap
+    });
+    if (!result.success) {
+        throw new SerwistConfigError({
+            moduleName: "@serwist/vite",
+            message: JSON.stringify(result.error.format(), null, 2)
+        });
+    }
+    return result.data;
+};
+
+const buildPlugin = (ctx, api)=>{
+    return {
+        name: "@serwist/vite:build",
+        enforce: "post",
+        apply: "build",
+        closeBundle: {
+            sequential: true,
+            order: ctx.userOptions?.integration?.closeBundleOrder,
+            async handler () {
+                if (!ctx.viteConfig.build.ssr && !ctx.options.disable) {
+                    await api.generateSW();
+                }
+            }
+        },
+        buildEnd (error) {
+            if (error) throw error;
+        }
+    };
+};
+
 const devPlugin = (ctx, api)=>{
     return {
         name: "@serwist/vite:dev",
@@ -346,110 +303,44 @@ const devPlugin = (ctx, api)=>{
     };
 };
 
-const INTERNAL_SERWIST_VIRTUAL = "virtual:internal-serwist";
-const RESOLVED_INTERNAL_SERWIST_VIRTUAL = `\0${INTERNAL_SERWIST_VIRTUAL}`;
+const SERWIST_VIRTUAL = "virtual:serwist";
+const RESOLVED_SERWIST_VIRTUAL = `\0${SERWIST_VIRTUAL}`;
 
-const buildManifestEntry = (publicDir, url)=>{
-    return new Promise((resolve$1, reject)=>{
-        const cHash = crypto.createHash("MD5");
-        const stream = fs$1.createReadStream(resolve(publicDir, url));
-        stream.on("error", (err)=>{
-            reject(err);
-        });
-        stream.on("data", (chunk)=>{
-            cHash.update(chunk);
-        });
-        stream.on("end", ()=>{
-            return resolve$1({
-                url,
-                revision: `${cHash.digest("hex")}`
-            });
-        });
-    });
-};
-const lookupAdditionalPrecacheEntries = (serwistOptions)=>{
-    return serwistOptions.additionalPrecacheEntries || [];
-};
-const normalizeIconPath = (path)=>{
-    return path.startsWith("/") ? path.substring(1) : path;
-};
-const configureStaticAssets = async (resolvedPluginOptions, viteConfig)=>{
-    const { injectManifest, includeAssets } = resolvedPluginOptions;
-    const { publicDir } = viteConfig;
-    const globs = [];
-    const manifestEntries = lookupAdditionalPrecacheEntries(injectManifest);
-    if (includeAssets) {
-        if (Array.isArray(includeAssets)) globs.push(...includeAssets.map(normalizeIconPath));
-        else globs.push(normalizeIconPath(includeAssets));
-    }
-    if (globs.length > 0) {
-        let assets = await fg(globs, {
-            cwd: publicDir,
-            onlyFiles: true,
-            unique: true
-        });
-        if (manifestEntries.length > 0) {
-            const included = manifestEntries.map((me)=>{
-                if (typeof me === "string") return me;
-                return me.url;
-            });
-            assets = assets.filter((a)=>!included.includes(a));
-        }
-        const assetsEntries = await Promise.all(assets.map((a)=>{
-            return buildManifestEntry(publicDir, a);
-        }));
-        manifestEntries.push(...assetsEntries);
-    }
-    if (manifestEntries.length > 0) {
-        injectManifest.additionalPrecacheEntries = manifestEntries;
-    }
+const prepareConfigForValidation = (viteConfig, { mode = process.env.NODE_ENV === "production" || process.env.NODE_ENV === "development" ? process.env.NODE_ENV : "production", base = viteConfig.base, scope: _scope, devOptions, ...injectManifest })=>{
+    const basePath = resolveBasePath(base);
+    return {
+        mode,
+        base: basePath,
+        scope: _scope || basePath,
+        devOptions,
+        ...injectManifest
+    };
 };
-
 const resolveOptions = async (options, viteConfig)=>{
-    const { type = "classic", mode = process$1.env.NODE_ENV === "production" || process$1.env.NODE_ENV === "development" ? process$1.env.NODE_ENV : "production", injectRegister = "auto", registerType = "prompt", minify = true, base = viteConfig.base, scope: _scope, swUrl = "/sw.js", includeAssets = undefined, useCredentials = false, disable = false, integration = {}, buildBase, devOptions, plugins = [], rollupOptions = {}, rollupFormat = "es", ...injectManifest } = options;
-    const basePath = resolveBasePath(base);
-    const scope = _scope || basePath;
+    const { mode, type, scope, base, disable, integration, swUrl, swSrc, swDest, plugins, rollupFormat, rollupOptions, devOptions, ...userInjectManifest } = await validateInjectManifestOptions(prepareConfigForValidation(viteConfig, options));
     let assetsDir = slash(viteConfig.build.assetsDir ?? "assets");
     if (assetsDir[assetsDir.length - 1] !== "/") assetsDir += "/";
-    const resolvedDevOptions = {
-        bundle: true,
-        minify: false,
-        ...devOptions
-    };
     const dontCacheBustURLsMatching = new RegExp(`^${assetsDir.replace(/^\.*?\//, "")}`);
-    const { validateViteInjectManifestOptions } = await loadSerwistBuild();
-    const validatedInjectManifest = await validateViteInjectManifestOptions(injectManifest);
-    const { swSrc, swDest, ...userInjectManifest } = validatedInjectManifest || {};
     const resolvedPluginOptions = {
-        base: basePath,
-        type,
         mode,
-        injectRegister,
-        registerType,
-        useCredentials,
+        type,
+        scope,
+        base,
+        disable,
+        integration,
         swUrl,
+        plugins,
+        rollupFormat,
+        rollupOptions,
+        devOptions,
         injectManifest: {
             dontCacheBustURLsMatching,
             ...userInjectManifest,
             swSrc: path.resolve(viteConfig.root, swSrc),
             swDest: path.resolve(viteConfig.root, viteConfig.build.outDir, swDest),
             disablePrecacheManifest: !viteConfig.isProduction
-        },
-        scope,
-        minify,
-        includeAssets,
-        disable,
-        integration,
-        buildBase: buildBase ?? basePath,
-        injectManifestRollupOptions: {
-            plugins,
-            rollupOptions,
-            format: rollupFormat
-        },
-        devOptions: resolvedDevOptions
+        }
     };
-    const calculateHash = !resolvedPluginOptions.disable && resolvedPluginOptions.includeAssets && viteConfig.command === "build";
-    if (calculateHash) await configureStaticAssets(resolvedPluginOptions, viteConfig);
     return resolvedPluginOptions;
 };
 
@@ -470,16 +361,22 @@ const mainPlugin = (ctx, api)=>{
             ctx.options = await resolveOptions(ctx.userOptions, config);
         },
         resolveId (id) {
-            if (id === INTERNAL_SERWIST_VIRTUAL) {
-                return RESOLVED_INTERNAL_SERWIST_VIRTUAL;
+            if (id === SERWIST_VIRTUAL) {
+                return RESOLVED_SERWIST_VIRTUAL;
             }
             return undefined;
         },
         load (id) {
-            if (id === RESOLVED_INTERNAL_SERWIST_VIRTUAL) {
-                return `export const swUrl = "${path.posix.join(ctx.options.buildBase, ctx.options.swUrl)}";
+            if (id === RESOLVED_SERWIST_VIRTUAL) {
+                return `export const swUrl = "${path.posix.join(ctx.options.base, ctx.options.swUrl)}";
 export const swScope = "${ctx.options.scope}";
-export const swType = "${ctx.devEnvironment ? "module" : ctx.options.type}";`;
+export const swType = "${ctx.devEnvironment ? "module" : ctx.options.type}";
+export const getSerwist = async () => {
+  if ("serviceWorker" in navigator) {
+    return new (await import("@serwist/window")).Serwist(swUrl, { scope: swScope, type: swType });
+  }
+  return undefined;
+}`;
             }
             return undefined;
         },
@@ -497,4 +394,4 @@ const serwist = (userOptions)=>{
     ];
 };
 
-export { buildPlugin as build, createApi, createContext, devPlugin as dev, mainPlugin as main, resolveEntry, serwist, toFs };
+export { buildPlugin as build, createApi, createContext, devPlugin as dev, mainPlugin as main, resolveEntry, serwist, toFs, validateInjectManifestOptions };

package/dist/index.schema.d.ts

@@ -0,0 +1,3 @@
+import { devOptions, hooks, injectManifestOptions, injectManifestPartial } from "./lib/schema.js";
+export { hooks, devOptions, injectManifestPartial, 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,UAAU,EAAE,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAElG,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,CAAC"}

package/dist/index.schema.js

@@ -0,0 +1,3 @@
+export { devOptions, hooks, injectManifestOptions, injectManifestPartial } from './chunks/schema.js';
+import '@serwist/build/schema';
+import 'zod';

package/dist/index.worker.d.ts

@@ -1,11 +1,9 @@
-import { CacheFirst, NetworkFirst } from "@serwist/strategies";
-export declare const defaultCache: ({
-    matcher: RegExp;
-    handler: CacheFirst;
-    method?: undefined;
-} | {
-    matcher: RegExp;
-    method: "GET";
-    handler: NetworkFirst;
-})[];
+import type { RuntimeCaching } from "serwist";
+/**
+ * The default, recommended list of caching strategies for applications
+ * built with Vite.
+ *
+ * @see https://serwist.pages.dev/docs/vite/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,EAAE,UAAU,EAAE,YAAY,EAAwB,MAAM,qBAAqB,CAAC;AAGrF,eAAO,MAAM,YAAY;;;;;;;;IAoGG,CAAC"}
+{"version":3,"file":"index.worker.d.ts","sourceRoot":"","sources":["../src/index.worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAG9C;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,cAAc,EA8GpC,CAAC"}

package/dist/index.worker.js

@@ -1,7 +1,6 @@
-import { ExpirationPlugin } from '@serwist/expiration';
-import { CacheFirst, StaleWhileRevalidate, NetworkFirst } from '@serwist/strategies';
+import { CacheFirst, ExpirationPlugin, StaleWhileRevalidate, NetworkFirst } from 'serwist';
 
-const defaultCache = [
+const defaultCache = import.meta.env.DEV ? [] : [
     {
         matcher: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
         handler: new CacheFirst({
@@ -9,7 +8,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 4,
-                    maxAgeSeconds: 365 * 24 * 60 * 60
+                    maxAgeSeconds: 365 * 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -21,7 +21,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 4,
-                    maxAgeSeconds: 7 * 24 * 60 * 60
+                    maxAgeSeconds: 7 * 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -33,7 +34,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 64,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -45,7 +47,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 32,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -57,7 +60,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 32,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -69,7 +73,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 32,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ]
         })
@@ -82,7 +87,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 16,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ],
             networkTimeoutSeconds: 10
@@ -95,7 +101,8 @@ const defaultCache = [
             plugins: [
                 new ExpirationPlugin({
                     maxEntries: 32,
-                    maxAgeSeconds: 24 * 60 * 60
+                    maxAgeSeconds: 24 * 60 * 60,
+                    maxAgeFrom: "last-used"
                 })
             ],
             networkTimeoutSeconds: 10

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

@@ -0,0 +1 @@
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,KAAK,EAA6B,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5E,eAAO,MAAM,SAAS,QAAS,kBAAkB,KAAG,cA8BnD,CAAC"}

package/dist/lib/constants.d.ts

@@ -0,0 +1,3 @@
+export declare const SERWIST_VIRTUAL = "virtual:serwist";
+export declare const RESOLVED_SERWIST_VIRTUAL = "\0virtual:serwist";
+//# sourceMappingURL=constants.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/lib/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,oBAAoB,CAAC;AACjD,eAAO,MAAM,wBAAwB,sBAAyB,CAAC"}

package/dist/{context.d.ts → lib/context.d.ts}

@@ -1,5 +1,5 @@
 import type { ResolvedConfig } from "vite";
-import type { PluginOptions, ResolvedPluginOptions } from "./types.js";
+import type { PluginOptions, PluginOptionsComplete } from "./types.js";
 export type SerwistViteFrameworks = "nuxt";
 export interface SerwistViteContext {
     /**
@@ -18,7 +18,7 @@ export interface SerwistViteContext {
      * Note: this is different from `userOptions` in that it has been parsed, whereas
      * `userOptions` is the raw configuration that the user provides us.
      */
-    options: ResolvedPluginOptions;
+    options: PluginOptionsComplete;
     useImportRegister: boolean;
     /**
      * Is the plugin running on dev?

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

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/lib/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE3C,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEvE,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,UAAU,EAAE,cAAc,CAAC;IAC3B;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;IAC3B;;;;;OAKG;IACH,OAAO,EAAE,qBAAqB,CAAC;IAC/B,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;;OAIG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB,8CAA8C;IAC9C,SAAS,EAAE,qBAAqB,GAAG,SAAS,CAAC;CAC9C;AAED,eAAO,MAAM,aAAa,gBAAiB,aAAa,aAAa,qBAAqB,GAAG,SAAS,KAAG,kBASxG,CAAC"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/lib/log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAI3C,eAAO,MAAM,gBAAgB,gBAAiB,KAAK,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,UAAU,CAAC,eAAe,cAAc,SAkB1H,CAAC"}

package/dist/{modules.d.ts → lib/modules.d.ts}

@@ -4,7 +4,7 @@ export declare const loadSerwistBuild: () => Promise<typeof SerwistBuild>;
 interface BuildResult extends SerwistBuild.GetManifestResult {
     manifestString: string;
 }
-export declare const injectManifest: (config: SerwistBuild.ViteInjectManifestOptions) => Promise<BuildResult>;
+export declare const injectManifest: (options: SerwistBuild.GetManifestOptionsComplete) => Promise<BuildResult>;
 export declare const generateServiceWorker: (ctx: SerwistViteContext) => Promise<BuildResult | undefined>;
 export {};
 //# sourceMappingURL=modules.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../src/lib/modules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,YAAY,MAAM,gBAAgB,CAAC;AAEpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,eAAO,MAAM,gBAAgB,QAAa,QAAQ,mBAAmB,CASpE,CAAC;AAEF,UAAU,WAAY,SAAQ,YAAY,CAAC,iBAAiB;IAC1D,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,cAAc,YAAmB,aAAa,0BAA0B,KAAG,QAAQ,WAAW,CAW1G,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAe,kBAAkB,qCAwIlE,CAAC"}

package/dist/lib/options.d.ts

@@ -0,0 +1,4 @@
+import type { ResolvedConfig } from "vite";
+import type { PluginOptions, PluginOptionsComplete } from "./types.js";
+export declare const resolveOptions: (options: PluginOptions, viteConfig: ResolvedConfig) => Promise<PluginOptionsComplete>;
+//# sourceMappingURL=options.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/lib/options.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE3C,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAwBvE,eAAO,MAAM,cAAc,YAAmB,aAAa,cAAc,cAAc,KAAG,QAAQ,qBAAqB,CA8CtH,CAAC"}