@serwist/vite 9.0.0-preview.2 → 9.0.0-preview.21

package/dist/lib/types.d.ts

@@ -0,0 +1,127 @@
+import type { BasePartial, BaseResolved, GlobPartial, GlobResolved, InjectPartial as BaseInjectPartial, InjectResolved as BaseInjectResolved, ManifestEntry, RequiredGlobDirectoryPartial, RequiredGlobDirectoryResolved, RequiredSwDestPartial, RequiredSwDestResolved } from "@serwist/build";
+import type { Require } from "@serwist/utils";
+import type { RollupOptions } from "rollup";
+import type { BuildOptions, Plugin, ResolvedConfig } from "vite";
+export interface InjectPartial {
+    /**
+     * The mode in which Serwist should be built.
+     *
+     * @default
+     * process.env.NODE_ENV // or "production" if undefined
+     */
+    mode?: "development" | "production";
+    /**
+     * The service worker type.
+     *
+     * @default "classic"
+     */
+    type?: WorkerType;
+    /**
+     * The scope with which Serwist should register the service worker.
+     *
+     * @default viteOptions.base
+     */
+    scope?: string;
+    /**
+     * The base from which Serwist resolves URLs.
+     *
+     * @default viteOptions.base
+     */
+    base?: string;
+    /**
+     * Whether Serwist should be disabled.
+     *
+     * @default false
+     */
+    disable?: boolean;
+    /**
+     * Hooks of the build lifecycle.
+     */
+    integration?: Hooks;
+    /**
+     * The URL to the service worker.
+     *
+     * @default "/sw.js"
+     */
+    swUrl?: string;
+    /**
+     * Plugins used to build your service worker.
+     */
+    plugins?: Plugin[];
+    /**
+     * The format used to build the service worker.
+     *
+     * @default "es"
+     */
+    rollupFormat?: "es" | "iife";
+    /**
+     * Custom Rollup options used to build the service worker.
+     */
+    rollupOptions?: Omit<RollupOptions, "plugins" | "output">;
+    /**
+     * Development-specific options.
+     */
+    devOptions?: DevOptions;
+}
+export interface InjectResolved extends Require<InjectPartial, "mode" | "type" | "scope" | "base" | "disable" | "swUrl" | "rollupFormat"> {
+    devOptions: Required<DevOptions>;
+}
+export interface InjectManifestOptions extends Omit<BasePartial, "disablePrecacheManifest">, GlobPartial, BaseInjectPartial, RequiredSwDestPartial, RequiredGlobDirectoryPartial, InjectPartial {
+}
+export interface InjectManifestOptionsComplete extends BaseResolved, GlobResolved, BaseInjectResolved, RequiredSwDestResolved, RequiredGlobDirectoryResolved, InjectResolved {
+}
+export interface Hooks {
+    beforeBuildServiceWorker?: (options: PluginOptionsComplete) => void | Promise<void>;
+    closeBundleOrder?: "pre" | "post" | null;
+    configureOptions?: (viteOptions: ResolvedConfig, options: PluginOptions) => void | Promise<void>;
+}
+export interface DevOptions {
+    /**
+     * Whether the service worker should be bundled in development mode.
+     *
+     * Many browsers still [do not support ES Modules in service workers](https://caniuse.com/mdn-api_serviceworker_ecmascript_modules). However, in development
+     * mode, certain frameworks, such as SvelteKit, do not bundle the service worker. As a result, trying to register that service worker on browsers lacking
+     * support, such as Firefox or Safari, will fail, but doing so on browsers not lacking support will not fail. This option is provided to prevent that from
+     * happening. What the plugin does is intercepting any request to the service worker (requests for `swUrl`) and returning a bundled one.
+     *
+     * @default true
+     */
+    bundle?: boolean;
+    /**
+     * Whether the service worker should be minified in development mode.
+     *
+     * @default false
+     */
+    minify?: BuildOptions["minify"];
+}
+export interface PluginOptions extends InjectManifestOptions {
+}
+export interface PluginOptionsComplete extends InjectResolved {
+    injectManifest: Omit<InjectManifestOptionsComplete, keyof InjectResolved>;
+}
+export interface ShareTargetFiles {
+    name: string;
+    accept: string | string[];
+}
+type Nothing = {};
+/**
+ * type StringLiteralUnion<'maskable'> = 'maskable' | string
+ * This has auto completion whereas `'maskable' | string` doesn't
+ * Adapted from https://github.com/microsoft/TypeScript/issues/29729
+ */
+export type StringLiteralUnion<T extends U, U = string> = T | (U & Nothing);
+export interface SerwistViteApi {
+    /**
+     * Whether the plugin is disabled.
+     */
+    disabled: boolean;
+    /**
+     * Extends the precache manifest.
+     * @param fn
+     */
+    extendManifestEntries(fn: ExtendManifestEntriesHook): void;
+    generateSW(): Promise<void>;
+}
+export type ExtendManifestEntriesHook = (manifestEntries: (string | ManifestEntry)[]) => (string | ManifestEntry)[] | undefined;
+export {};
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,KAAK,QAAS,MAAM,WAEhC,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,WAG3C,CAAC;AAEF,eAAO,MAAM,UAAU,QAAS,MAAM,4BAErC,CAAC;AAEF,eAAO,MAAM,aAAa,SAAU,MAAM,WAEzC,CAAC;AAIF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,UAAW,MAAM,KAAG,MAAM,GAAG,IAqBrD,CAAC;AAIF;;;;;;;GAOG;AACH,eAAO,MAAM,IAAI,QAAS,MAAM,WAI/B,CAAC"}

package/dist/lib/validator.d.ts

@@ -0,0 +1,3 @@
+import type { InjectManifestOptionsComplete } from "./types.js";
+export declare const validateInjectManifestOptions: (input: unknown) => Promise<InjectManifestOptionsComplete>;
+//# sourceMappingURL=validator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/lib/validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAEhE,eAAO,MAAM,6BAA6B,UAAiB,OAAO,KAAG,QAAQ,6BAA6B,CAMzG,CAAC"}

package/dist/plugins/build.d.ts

@@ -1,6 +1,6 @@
 import type { Plugin } from "vite";
-import type { SerwistViteContext } from "../context.js";
-import type { SerwistViteApi } from "../types.js";
+import type { SerwistViteContext } from "../lib/context.js";
+import type { SerwistViteApi } from "../lib/types.js";
 /**
  * Internal build plugin used by `@serwist/vite`.
  * @internal

package/dist/plugins/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/plugins/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,QAAS,kBAAkB,OAAO,cAAc,gBAkBvE,CAAC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/plugins/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,QAAS,kBAAkB,OAAO,cAAc,gBAkBvE,CAAC"}

package/dist/plugins/dev.d.ts

@@ -1,6 +1,6 @@
 import { type Plugin } from "vite";
-import type { SerwistViteContext } from "../context.js";
-import type { SerwistViteApi } from "../types.js";
+import type { SerwistViteContext } from "../lib/context.js";
+import type { SerwistViteApi } from "../lib/types.js";
 /**
  * Internal dev plugin used by `@serwist/vite`.
  * @internal

package/dist/plugins/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/plugins/dev.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,MAAM,CAAC;AAElD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AASlD;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,QAAS,kBAAkB,OAAO,cAAc,KAAG,MAsCxE,CAAC"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/plugins/dev.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,MAAM,CAAC;AAElD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAStD;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,QAAS,kBAAkB,OAAO,cAAc,KAAG,MAsCxE,CAAC"}

package/dist/plugins/main.d.ts

@@ -1,6 +1,6 @@
 import type { Plugin } from "vite";
-import type { SerwistViteContext } from "../context.js";
-import type { SerwistViteApi } from "../types.js";
+import type { SerwistViteContext } from "../lib/context.js";
+import type { SerwistViteApi } from "../lib/types.js";
 /**
  * Internal plugin used by `@serwist/vite`.
  * @internal

package/dist/plugins/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/plugins/main.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAC;AAG/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,QAAS,kBAAkB,OAAO,cAAc,gBAgCtE,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/plugins/main.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAC;AAG/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,QAAS,kBAAkB,OAAO,cAAc,gBAgCtE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/vite",
-  "version": "9.0.0-preview.2",
+  "version": "9.0.0-preview.21",
   "type": "module",
   "description": "A module that integrates Serwist into your Vite application.",
   "files": [
@@ -30,8 +30,8 @@
   },
   "author": "antfu <anthonyfu117@hotmail.com>, Serwist's Team",
   "license": "MIT",
-  "repository": "serwist/serwist",
-  "bugs": "https://github.com/serwist/serwist/issues",
+  "repository": "https://gitlab.com/serwist/serwist",
+  "bugs": "https://gitlab.com/serwist/serwist/issues",
   "homepage": "https://serwist.pages.dev",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -44,8 +44,8 @@
       "worker": [
         "./dist/index.worker.d.ts"
       ],
-      "integration-*": [
-        "./dist/integration/*/index.d.ts"
+      "schema": [
+        "./dist/index.schema.d.ts"
       ]
     }
   },
@@ -62,76 +62,36 @@
       "types": "./dist/index.worker.d.ts",
       "default": "./dist/index.worker.js"
     },
-    "./integration-*": {
-      "types": "./dist/integration/*/index.d.ts",
-      "default": "./dist/integration/*/index.js"
+    "./schema": {
+      "types": "./dist/index.schema.d.ts",
+      "default": "./dist/index.schema.js"
     },
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "debug": "4.3.4",
-    "fast-glob": "3.3.2",
-    "pretty-bytes": "6.1.1",
-    "@serwist/build": "9.0.0-preview.2",
-    "@serwist/window": "9.0.0-preview.2"
+    "glob": "10.3.10",
+    "kolorist": "1.8.0",
+    "zod": "3.22.4",
+    "@serwist/build": "9.0.0-preview.21",
+    "@serwist/sw": "9.0.0-preview.21",
+    "@serwist/window": "9.0.0-preview.21"
   },
   "devDependencies": {
-    "@playwright/test": "1.41.2",
-    "@sveltejs/kit": "2.5.0",
-    "@types/debug": "4.1.12",
-    "@types/node": "20.11.16",
-    "@types/prompts": "2.4.9",
-    "@types/react": "18.2.54",
-    "bumpp": "9.3.0",
-    "kolorist": "1.8.0",
-    "preact": "10.19.3",
-    "prompts": "2.4.2",
-    "publint": "0.2.7",
-    "react": "18.2.0",
-    "rollup": "4.9.6",
-    "solid-js": "1.8.14",
-    "svelte": "5.0.0-next.48",
-    "typescript": "5.4.0-dev.20240206",
-    "vite": "5.0.12",
-    "vue": "3.4.15",
-    "@serwist/constants": "9.0.0-preview.2",
-    "@serwist/sw": "9.0.0-preview.2"
+    "@types/node": "20.11.30",
+    "rollup": "4.13.0",
+    "typescript": "5.5.0-dev.20240323",
+    "vite": "5.2.4",
+    "@serwist/constants": "9.0.0-preview.21",
+    "@serwist/sw": "9.0.0-preview.21",
+    "@serwist/utils": "9.0.0-preview.21"
   },
   "peerDependencies": {
-    "@sveltejs/kit": "^1.0.0 || ^2.0.0",
-    "preact": "^10.0.0",
-    "react": "^18.0.0",
-    "solid-js": "^1.8.7",
-    "svelte": "^4.0.0 || ^5.0.0",
     "typescript": ">=5.0.0",
-    "vite": "^5.0.0",
-    "vue": "^3.0.0",
-    "@serwist/sw": "9.0.0-preview.2"
+    "vite": "^5.0.0"
   },
   "peerDependenciesMeta": {
-    "@serwist/sw": {
-      "optional": true
-    },
-    "@sveltejs/kit": {
-      "optional": true
-    },
-    "preact": {
-      "optional": true
-    },
-    "react": {
-      "optional": true
-    },
-    "solid-js": {
-      "optional": true
-    },
-    "svelte": {
-      "optional": true
-    },
     "typescript": {
       "optional": true
-    },
-    "vue": {
-      "optional": true
     }
   },
   "scripts": {

package/src/index.schema.ts

@@ -0,0 +1,3 @@
+import { devOptions, hooks, injectManifestOptions, injectManifestPartial } from "./lib/schema.js";
+
+export { hooks, devOptions, injectManifestPartial, injectManifestOptions };

package/src/index.ts

@@ -1,12 +1,13 @@
 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.
@@ -20,6 +21,6 @@ export const serwist = (userOptions: PluginOptions): Plugin[] => {
 };
 
 // This allows for customization.
-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 };

package/src/index.worker.ts

@@ -1,95 +1,121 @@
 import type { RuntimeCaching } from "@serwist/sw";
+import { ExpirationPlugin } from "@serwist/sw/plugins";
+import { CacheFirst, NetworkFirst, StaleWhileRevalidate } from "@serwist/sw/strategies";
 
-export const defaultCache: RuntimeCaching[] = [
-  {
-    urlPattern: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
-    handler: "CacheFirst",
-    options: {
-      cacheName: "google-fonts",
-      expiration: {
-        maxEntries: 4,
-        maxAgeSeconds: 365 * 24 * 60 * 60, // 365 days
+/**
+ * The default, recommended list of caching strategies for applications
+ * built with Vite.
+ *
+ * @see https://serwist.pages.dev/docs/vite/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",
+            }),
+          ],
+        }),
       },
-    },
-  },
-  {
-    urlPattern: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "static-font-assets",
-      expiration: {
-        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",
+            }),
+          ],
+        }),
       },
-    },
-  },
-  {
-    urlPattern: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "static-image-assets",
-      expiration: {
-        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",
+            }),
+          ],
+        }),
       },
-    },
-  },
-  {
-    urlPattern: /\.(?:js)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "static-js-assets",
-      expiration: {
-        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",
+            }),
+          ],
+        }),
       },
-    },
-  },
-  {
-    urlPattern: /\.(?:css|less)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "static-style-assets",
-      expiration: {
-        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",
+            }),
+          ],
+        }),
       },
-    },
-  },
-  {
-    urlPattern: /\.(?:json|xml|csv)$/i,
-    handler: "NetworkFirst",
-    options: {
-      cacheName: "static-data-assets",
-      expiration: {
-        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",
+            }),
+          ],
+        }),
       },
-    },
-  },
-  {
-    urlPattern: /\/api\/.*$/i,
-    handler: "NetworkFirst",
-    method: "GET",
-    options: {
-      cacheName: "apis",
-      expiration: {
-        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
-    },
-  },
-  {
-    urlPattern: /.*/i,
-    handler: "NetworkFirst",
-    options: {
-      cacheName: "others",
-      expiration: {
-        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,
-    },
-  },
-];
+    ];

package/src/{context.ts → lib/context.ts}

@@ -1,8 +1,8 @@
 import type { ResolvedConfig } from "vite";
 
-import type { PluginOptions, ResolvedPluginOptions } from "./types.js";
+import type { PluginOptions, PluginOptionsComplete } from "./types.js";
 
-export type SerwistViteFrameworks = "nuxt" | "sveltekit";
+export type SerwistViteFrameworks = "nuxt";
 
 export interface SerwistViteContext {
   /**
@@ -21,7 +21,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/src/{log.ts → lib/log.ts}

@@ -2,7 +2,7 @@ import type { BuildResult } from "@serwist/build";
 import { cyan, dim, green, yellow } from "kolorist";
 import type { ResolvedConfig } from "vite";
 
-import { version } from "../package.json";
+import { version } from "../../package.json";
 
 export const logSerwistResult = (buildResult: Pick<BuildResult, "count" | "size" | "warnings">, viteOptions: ResolvedConfig) => {
   const { logLevel = "info" } = viteOptions;

package/src/{modules.ts → lib/modules.ts}

@@ -21,9 +21,8 @@ interface BuildResult extends SerwistBuild.GetManifestResult {
   manifestString: string;
 }
 
-export const injectManifest = async (config: SerwistBuild.ViteInjectManifestOptions): Promise<BuildResult> => {
-  const { validateViteInjectManifestOptions, getFileManifestEntries, stringify } = await loadSerwistBuild();
-  const options = await validateViteInjectManifestOptions(config);
+export const injectManifest = async (options: SerwistBuild.GetManifestOptionsComplete): Promise<BuildResult> => {
+  const { getFileManifestEntries, stringify } = await loadSerwistBuild();
   const { count, size, manifestEntries, warnings } = await getFileManifestEntries(options);
   const manifestString = manifestEntries === undefined ? "undefined" : stringify(manifestEntries);
   return {
@@ -36,7 +35,7 @@ export const injectManifest = async (config: SerwistBuild.ViteInjectManifestOpti
 };
 
 export const generateServiceWorker = async (ctx: SerwistViteContext) => {
-  const { format, plugins, rollupOptions } = ctx.options.injectManifestRollupOptions;
+  const { plugins, rollupOptions, rollupFormat } = ctx.options;
 
   const parsedSwDest = path.parse(ctx.options.injectManifest.swDest);
 
@@ -50,7 +49,7 @@ export const generateServiceWorker = async (ctx: SerwistViteContext) => {
   const isProduction = ctx.options.mode === "production";
   const isDev = ctx.options.mode === "development";
 
-  if ((isProduction && ctx.framework === "sveltekit") || (isDev && !ctx.options.devOptions.bundle)) {
+  if (isDev && !ctx.options.devOptions.bundle) {
     if (!injectManifestResult) {
       throw new Error("injectManifest failed to generate results. This is likely a bug.");
     }
@@ -152,7 +151,7 @@ export const generateServiceWorker = async (ctx: SerwistViteContext) => {
         lib: {
           entry: ctx.options.injectManifest.swSrc,
           name: "app",
-          formats: [format],
+          formats: [rollupFormat],
         },
         rollupOptions: {
           ...rollupOptions,