@serwist/vite 9.0.0-preview.0 → 9.0.0-preview.10

package/dist/index.worker.js

@@ -1,94 +1,105 @@
+import { ExpirationPlugin } from '@serwist/expiration';
+import { CacheFirst, StaleWhileRevalidate, NetworkFirst } from '@serwist/strategies';
+
 const defaultCache = [
     {
-        urlPattern: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
-        handler: "CacheFirst",
-        options: {
+        matcher: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
+        handler: new CacheFirst({
             cacheName: "google-fonts",
-            expiration: {
-                maxEntries: 4,
-                maxAgeSeconds: 365 * 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 4,
+                    maxAgeSeconds: 365 * 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
-        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
+                })
+            ]
+        })
     },
     {
-        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: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 64,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\.(?:js)$/i,
-        handler: "StaleWhileRevalidate",
-        options: {
+        matcher: /\.(?:js)$/i,
+        handler: new StaleWhileRevalidate({
             cacheName: "static-js-assets",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            }
-        }
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ]
+        })
     },
     {
-        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
+                })
+            ]
+        })
     },
     {
-        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
+                })
+            ]
+        })
     },
     {
-        urlPattern: /\/api\/.*$/i,
-        handler: "NetworkFirst",
+        matcher: /\/api\/.*$/i,
         method: "GET",
-        options: {
+        handler: new NetworkFirst({
             cacheName: "apis",
-            expiration: {
-                maxEntries: 16,
-                maxAgeSeconds: 24 * 60 * 60
-            },
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 16,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ],
             networkTimeoutSeconds: 10
-        }
+        })
     },
     {
-        urlPattern: /.*/i,
-        handler: "NetworkFirst",
-        options: {
+        matcher: /.*/i,
+        handler: new NetworkFirst({
             cacheName: "others",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
-            },
+            plugins: [
+                new ExpirationPlugin({
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                })
+            ],
             networkTimeoutSeconds: 10
-        }
+        })
     }
 ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/vite",
-  "version": "9.0.0-preview.0",
+  "version": "9.0.0-preview.10",
   "type": "module",
   "description": "A module that integrates Serwist into your Vite application.",
   "files": [
@@ -43,9 +43,6 @@
       ],
       "worker": [
         "./dist/index.worker.d.ts"
-      ],
-      "integration-*": [
-        "./dist/integration/*/index.d.ts"
       ]
     }
   },
@@ -62,18 +59,16 @@
       "types": "./dist/index.worker.d.ts",
       "default": "./dist/index.worker.js"
     },
-    "./integration-*": {
-      "types": "./dist/integration/*/index.d.ts",
-      "default": "./dist/integration/*/index.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.0",
-    "@serwist/window": "9.0.0-preview.0"
+    "@serwist/build": "9.0.0-preview.10",
+    "@serwist/expiration": "9.0.0-preview.10",
+    "@serwist/strategies": "9.0.0-preview.10",
+    "@serwist/window": "9.0.0-preview.10"
   },
   "devDependencies": {
     "@playwright/test": "1.41.2",
@@ -81,7 +76,7 @@
     "@types/debug": "4.1.12",
     "@types/node": "20.11.16",
     "@types/prompts": "2.4.9",
-    "@types/react": "18.2.52",
+    "@types/react": "18.2.54",
     "bumpp": "9.3.0",
     "kolorist": "1.8.0",
     "preact": "10.19.3",
@@ -89,13 +84,13 @@
     "publint": "0.2.7",
     "react": "18.2.0",
     "rollup": "4.9.6",
-    "solid-js": "1.8.12",
-    "svelte": "5.0.0-next.45",
-    "typescript": "5.4.0-dev.20240203",
+    "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.0",
-    "@serwist/sw": "9.0.0-preview.0"
+    "@serwist/constants": "9.0.0-preview.10",
+    "@serwist/sw": "9.0.0-preview.10"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^1.0.0 || ^2.0.0",
@@ -106,7 +101,7 @@
     "typescript": ">=5.0.0",
     "vite": "^5.0.0",
     "vue": "^3.0.0",
-    "@serwist/sw": "9.0.0-preview.0"
+    "@serwist/sw": "9.0.0-preview.10"
   },
   "peerDependenciesMeta": {
     "@serwist/sw": {

package/src/context.ts

@@ -2,7 +2,7 @@ import type { ResolvedConfig } from "vite";
 
 import type { PluginOptions, ResolvedPluginOptions } from "./types.js";
 
-export type SerwistViteFrameworks = "nuxt" | "sveltekit";
+export type SerwistViteFrameworks = "nuxt";
 
 export interface SerwistViteContext {
   /**

package/src/index.worker.ts

@@ -1,95 +1,105 @@
+import { ExpirationPlugin } from "@serwist/expiration";
+import { CacheFirst, NetworkFirst, StaleWhileRevalidate } from "@serwist/strategies";
 import type { RuntimeCaching } from "@serwist/sw";
 
-export const defaultCache: RuntimeCaching[] = [
+export const defaultCache = [
   {
-    urlPattern: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
-    handler: "CacheFirst",
-    options: {
+    matcher: /^https:\/\/fonts\.(?:googleapis|gstatic)\.com\/.*/i,
+    handler: new CacheFirst({
       cacheName: "google-fonts",
-      expiration: {
-        maxEntries: 4,
-        maxAgeSeconds: 365 * 24 * 60 * 60, // 365 days
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 4,
+          maxAgeSeconds: 365 * 24 * 60 * 60, // 365 days
+        }),
+      ],
+    }),
   },
   {
-    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, // 7 days
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 4,
+          maxAgeSeconds: 7 * 24 * 60 * 60, // 7 days
+        }),
+      ],
+    }),
   },
   {
-    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: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 64,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
-    urlPattern: /\.(?:js)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
+    matcher: /\.(?:js)$/i,
+    handler: new StaleWhileRevalidate({
       cacheName: "static-js-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
-    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, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
-    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, // 24 hours
-      },
-    },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
+    }),
   },
   {
-    urlPattern: /\/api\/.*$/i,
-    handler: "NetworkFirst",
+    matcher: /\/api\/.*$/i,
     method: "GET",
-    options: {
+    handler: new NetworkFirst({
       cacheName: "apis",
-      expiration: {
-        maxEntries: 16,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 16,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
       networkTimeoutSeconds: 10, // fallback to cache if API does not response within 10 seconds
-    },
+    }),
   },
   {
-    urlPattern: /.*/i,
-    handler: "NetworkFirst",
-    options: {
+    matcher: /.*/i,
+    handler: new NetworkFirst({
       cacheName: "others",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
+      plugins: [
+        new ExpirationPlugin({
+          maxEntries: 32,
+          maxAgeSeconds: 24 * 60 * 60, // 24 hours
+        }),
+      ],
       networkTimeoutSeconds: 10,
-    },
+    }),
   },
-];
+] satisfies RuntimeCaching[];

package/src/modules.ts

@@ -50,7 +50,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.");
     }

package/src/options.ts

@@ -11,7 +11,7 @@ import { resolveBasePath, slash } from "./utils.js";
 export const resolveOptions = async (options: PluginOptions, viteConfig: ResolvedConfig): Promise<ResolvedPluginOptions> => {
   const {
     type = "classic",
-    mode = (process.env.NODE_ENV || "production") as "production" | "development",
+    mode = process.env.NODE_ENV === "production" || process.env.NODE_ENV === "development" ? process.env.NODE_ENV : "production",
     injectRegister = "auto",
     registerType = "prompt",
     minify = true,

package/src/rollup.js

@@ -1,28 +1,8 @@
 // @ts-check
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
 import { getRollupOptions } from "@serwist/constants/rollup";
-import fg from "fast-glob";
 
 import packageJson from "../package.json" assert { type: "json" };
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-const clientEntries = /** @type {Record<string, string>} */ ({});
-
-for (const clientPath of await fg("client/*.ts", { cwd: __dirname })) {
-  const parsedClientPath = path.parse(clientPath);
-  clientEntries[`client/${parsedClientPath.name}`] = path.join("src", clientPath);
-}
-
-const integrationEntries = /** @type {Record<string, string>} */ ({});
-
-for (const integrationPath of await fg("integration/*/index.ts", { cwd: __dirname })) {
-  const parsedClientPath = path.parse(integrationPath);
-  integrationEntries[`${parsedClientPath.dir}/${parsedClientPath.name}`] = path.join("src", integrationPath);
-}
-
 export default getRollupOptions({
   packageJson,
   jsFiles: [
@@ -31,8 +11,6 @@ export default getRollupOptions({
         index: "src/index.ts",
         "index.browser": "src/index.browser.ts",
         "index.worker": "src/index.worker.ts",
-        ...clientEntries,
-        ...integrationEntries,
       },
       output: {
         dir: "dist",

package/dist/integration/svelte/build.d.ts

@@ -1,5 +0,0 @@
-import type { Plugin } from "vite";
-import type { SerwistViteContext } from "../../context.js";
-import type { SerwistViteApi } from "../../types.js";
-export declare const buildPlugin: (ctx: SerwistViteContext, api: SerwistViteApi) => Plugin<any>;
-//# sourceMappingURL=build.d.ts.map

package/dist/integration/svelte/build.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/integration/svelte/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,eAAO,MAAM,WAAW,QAAS,kBAAkB,OAAO,cAAc,gBAevE,CAAC"}

package/dist/integration/svelte/config.d.ts

@@ -1,9 +0,0 @@
-import type { ManifestTransform } from "@serwist/build";
-import type { ResolvedConfig } from "vite";
-import type { PluginOptions as BasePluginOptions } from "../../types.js";
-import type { KitOptions } from "./types.js";
-export declare const configurateSvelteKitOptions: (viteConfig: ResolvedConfig, kit: KitOptions, options: BasePluginOptions) => void;
-export declare function createManifestTransform(base: string, webManifestName?: string, options?: KitOptions): ManifestTransform;
-export declare function buildGlobPatterns(globPatterns?: string[]): string[];
-export declare function buildGlobIgnores(globIgnores?: string[]): string[];
-//# sourceMappingURL=config.d.ts.map

package/dist/integration/svelte/config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/integration/svelte/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE3C,OAAO,KAAK,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,2BAA2B,eAAgB,cAAc,OAAO,UAAU,WAAW,iBAAiB,SAiDlH,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,iBAAiB,CAqDvH;AAED,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAYxD;AAED,wBAAgB,gBAAgB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,YAQtD"}

package/dist/integration/svelte/index.d.ts

@@ -1,10 +0,0 @@
-import type { Plugin } from "vite";
-import type { PluginOptions } from "./types.js";
-/**
- * Integrates Serwist into your SvelteKit app.
- * @param userOptions
- * @returns
- */
-export declare const serwist: (userOptions?: PluginOptions) => Plugin[];
-export * from "./types.js";
-//# sourceMappingURL=index.d.ts.map

package/dist/integration/svelte/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/integration/svelte/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AASnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhD;;;;GAIG;AACH,eAAO,MAAM,OAAO,iBAAiB,aAAa,KAAQ,MAAM,EAO/D,CAAC;AAEF,cAAc,YAAY,CAAC"}