@serwist/nuxt 9.1.0-preview.0 → 9.1.0

package/dist/module.d.mts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { PluginOptions } from 'vite-plugin-serwist';
+import { PluginOptions } from '@serwist/vite';
 
 /**
  * Make certain fields in a object type optional
@@ -31,4 +31,5 @@ interface ModuleOptions extends Optional<PluginOptions, "swSrc" | "swDest" | "gl
 
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
-export { type ClientOptions, type ModuleOptions, _default as default };
+export { _default as default };
+export type { ClientOptions, ModuleOptions };

package/dist/module.json

@@ -2,12 +2,11 @@
   "name": "@serwist/nuxt",
   "configKey": "serwist",
   "compatibility": {
-    "nuxt": "^3.8.0",
-    "bridge": false
+    "nuxt": "^3.8.0 || ^4.0.0"
   },
-  "version": "9.1.0-preview.0",
+  "version": "9.1.0",
   "builder": {
-    "@nuxt/module-builder": "0.8.4",
+    "@nuxt/module-builder": "1.0.1",
     "unbuild": "unknown"
   }
 }

package/dist/module.mjs

@@ -1,23 +1,21 @@
 import path from 'node:path';
 import { defineNuxtModule, createResolver, addPlugin, extendWebpackConfig } from '@nuxt/kit';
-import { resolveEntry, createContext, main, dev, generateServiceWorker } from 'vite-plugin-serwist';
+import { createContext, createApi, main, dev, resolveEntry } from '@serwist/vite';
 import { createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
 import fsp from 'node:fs/promises';
 
-const version = "9.1.0-preview.0";
+const version = "9.1.0";
 
 function configurePwaOptions(options, nuxt, nitroConfig) {
   let buildAssetsDir = nuxt.options.app.buildAssetsDir ?? "_nuxt/";
-  if (buildAssetsDir[0] === "/")
-    buildAssetsDir = buildAssetsDir.slice(1);
-  if (buildAssetsDir[buildAssetsDir.length - 1] !== "/")
-    buildAssetsDir += "/";
+  if (buildAssetsDir[0] === "/") buildAssetsDir = buildAssetsDir.slice(1);
+  if (buildAssetsDir[buildAssetsDir.length - 1] !== "/") buildAssetsDir += "/";
   if (!("dontCacheBustURLsMatching" in options)) {
     options.dontCacheBustURLsMatching = new RegExp(buildAssetsDir);
   }
   if (nuxt.options.experimental.payloadExtraction) {
-    const enableGlobPatterns = nuxt.options._generate || !!nitroConfig.prerender?.routes?.length || Object.values(nitroConfig.routeRules ?? {}).some((r) => r.prerender);
+    const enableGlobPatterns = nuxt.options.nitro.static || nuxt.options._generate || !!nitroConfig.prerender?.routes?.length || Object.values(nitroConfig.routeRules ?? {}).some((r) => r.prerender);
     if (enableGlobPatterns) {
       options.globPatterns = options.globPatterns ?? [];
       options.globPatterns.push("**/_payload.json");
@@ -68,10 +66,8 @@ function createManifestTransform(base, publicDir, appManifestFolder) {
           });
         });
         const latestEntry = entries.find((e) => e.url === latest);
-        if (latestEntry)
-          latestEntry.revision = revision;
-        else
-          entries.push({ url: latest, revision, size: data.size });
+        if (latestEntry) latestEntry.revision = revision;
+        else entries.push({ url: latest, revision, size: data.size });
       } else {
         entries = entries.filter((e) => e.url !== latest);
       }
@@ -85,13 +81,12 @@ const module = defineNuxtModule({
     name: "@serwist/nuxt",
     configKey: "serwist",
     compatibility: {
-      nuxt: "^3.8.0",
-      bridge: false
+      nuxt: "^3.8.0 || ^4.0.0"
     },
     version
   },
   defaults(nuxt) {
-    const publicDir = nuxt.options.nitro?.output?.publicDir ? path.resolve(nuxt.options.nitro.output.publicDir) : path.resolve(nuxt.options.buildDir, "../.output/public");
+    const publicDir = path.resolve(nuxt.options.rootDir, ".output/public");
     return {
       base: nuxt.options.app.baseURL,
       scope: nuxt.options.app.baseURL,
@@ -110,11 +105,11 @@ const module = defineNuxtModule({
   async setup(options, nuxt) {
     const resolver = createResolver(import.meta.url);
     let ctx;
+    let api;
     const { client: _client, ...userOptions } = options;
     const client = { registerPlugin: true, ..._client };
     const runtimeDir = resolver.resolve("./runtime");
-    if (!nuxt.options.ssr)
-      nuxt.options.build.transpile.push(runtimeDir);
+    if (!nuxt.options.ssr) nuxt.options.build.transpile.push(runtimeDir);
     if (client.registerPlugin) {
       addPlugin({
         src: resolver.resolve(runtimeDir, "plugins/client"),
@@ -128,17 +123,19 @@ const module = defineNuxtModule({
       configurePwaOptions(options, nuxt, nitro.options);
     });
     nuxt.hook("vite:extend", ({ config }) => {
-      const plugin = config.plugins?.find((p) => p && typeof p === "object" && "name" in p && p.name === "vite-plugin-serwist");
+      const plugin = config.plugins?.find((p) => p && typeof p === "object" && "name" in p && p.name === "@serwist/vite");
       if (plugin) {
-        throw new Error("Remove 'vite-plugin-serwist' from your Vite configuration! Do not use it alongside '@serwist/nuxt'.");
+        throw new Error("Remove '@serwist/vite' from your Vite configuration! Do not use it alongside '@serwist/nuxt'.");
       }
     });
     nuxt.hook("vite:extendConfig", async (viteInlineConfig, { isClient }) => {
-      if (!viteInlineConfig.plugins)
+      if (!viteInlineConfig.plugins) {
         viteInlineConfig.plugins = [];
-      const plugin = viteInlineConfig.plugins.find((p) => p && typeof p === "object" && "name" in p && p.name === "vite-plugin-serwist");
-      if (plugin)
-        throw new Error("Remove 'vite-plugin-serwist' from your Vite configuration! Do not use it alongside '@serwist/nuxt'.");
+      }
+      const plugin = viteInlineConfig.plugins.find((p) => p && typeof p === "object" && "name" in p && p.name === "@serwist/vite");
+      if (plugin) {
+        throw new Error("Remove '@serwist/vite' from your Vite configuration! Do not use it alongside '@serwist/nuxt'.");
+      }
       if (isClient) {
         const configuration = "virtual:serwist-nuxt-configuration";
         const resolvedConfiguration = `\0${configuration}`;
@@ -160,15 +157,19 @@ const module = defineNuxtModule({
         });
       }
       ctx = createContext(userOptions, "nuxt");
-      viteInlineConfig.plugins.push(main(ctx), dev(ctx));
+      api = createApi(ctx);
+      const plugins = [main(ctx, api), dev(ctx, api)];
+      viteInlineConfig.plugins.push(plugins);
     });
     extendWebpackConfig(() => {
       throw new Error("Webpack is not supported: '@serwist/nuxt' can only be used with Vite!");
     });
     if (!nuxt.options.dev) {
       nuxt.hook("nitro:build:public-assets", () => {
-        if (ctx && !ctx.options.disable)
-          void generateServiceWorker(ctx);
+        if (!api || api.disabled) {
+          return;
+        }
+        void api.generateSW();
       });
     }
   }

package/dist/runtime/plugins/client.d.ts

@@ -1,2 +1,6 @@
-declare const plugin: any;
+import type { Serwist } from "@serwist/window";
+import type { Plugin } from "#app";
+declare const plugin: Plugin<{
+    serwist: Serwist | undefined;
+}>;
 export default plugin;

package/dist/types.d.mts

@@ -1 +1,3 @@
-export { type ClientOptions, type ModuleOptions, default } from './module.js'
+export { default } from './module.mjs'
+
+export { type ClientOptions, type ModuleOptions } from './module.mjs'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/nuxt",
-  "version": "9.1.0-preview.0",
+  "version": "9.1.0",
   "type": "module",
   "description": "A Nuxt module that integrates Serwist into your application.",
   "files": [
@@ -27,7 +27,6 @@
   "bugs": "https://github.com/serwist/serwist/issues",
   "homepage": "https://serwist.pages.dev",
   "main": "./dist/module.mjs",
-  "types": "./dist/types.d.ts",
   "exports": {
     ".": {
       "types": "./dist/types.d.mts",
@@ -45,29 +44,29 @@
       "vite",
       "@nuxt/kit",
       "@serwist/build",
-      "vite-plugin-serwist",
+      "@serwist/vite",
       "virtual:serwist-nuxt-configuration",
       "virtual:serwist"
     ]
   },
   "dependencies": {
-    "@nuxt/kit": "3.13.2",
-    "@serwist/build": "9.1.0-preview.0",
-    "vite-plugin-serwist": "9.1.0-preview.0",
-    "@serwist/window": "9.1.0-preview.0"
+    "@nuxt/kit": "4.0.0",
+    "@serwist/build": "9.1.0",
+    "@serwist/vite": "9.1.0",
+    "@serwist/window": "9.1.0"
   },
   "devDependencies": {
-    "@nuxt/module-builder": "0.8.4",
-    "@nuxt/schema": "3.13.2",
-    "@types/node": "22.8.6",
-    "eslint": "9.14.0",
-    "nuxt": "3.13.2",
+    "@nuxt/module-builder": "1.0.1",
+    "@nuxt/schema": "4.0.0",
+    "@types/node": "24.0.14",
+    "eslint": "9.31.0",
+    "nuxt": "4.0.0",
     "rimraf": "5.0.9",
     "serve": "14.2.4",
-    "typescript": "5.6.3",
-    "vite": "5.4.10",
-    "vue-tsc": "2.1.10",
-    "@serwist/configs": "9.1.0-preview.0"
+    "typescript": "5.8.3",
+    "vite": "7.0.4",
+    "vue-tsc": "3.0.1",
+    "@serwist/configs": "9.1.0"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",

package/dist/module.cjs

@@ -1,5 +0,0 @@
-module.exports = function(...args) {
-  return import('./module.mjs').then(m => m.default.call(this, ...args))
-}
-const _meta = module.exports.meta = require('./module.json')
-module.exports.getMeta = () => Promise.resolve(_meta)

package/dist/module.d.ts

@@ -1,34 +0,0 @@
-import * as _nuxt_schema from '@nuxt/schema';
-import { PluginOptions } from 'vite-plugin-serwist';
-
-/**
- * Make certain fields in a object type optional
- *
- * @example
- *     interface A {
- *         a: string;
- *         b: string;
- *         c: string;
- *     }
- *     type B = Optional<A, "b" | "c">;
- *     const b: B = { a: "hehe" }; //valid
- *     const b: B = {}; //invalid
- */
-type Optional<T, U extends keyof T> = Omit<T, U> & Partial<Pick<T, U>>;
-
-interface ClientOptions {
-    /**
-     * Whether this plugin should be registered.
-     */
-    registerPlugin?: boolean;
-}
-interface ModuleOptions extends Optional<PluginOptions, "swSrc" | "swDest" | "globDirectory"> {
-    /**
-     * Options for plugin.
-     */
-    client?: ClientOptions;
-}
-
-declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
-
-export { type ClientOptions, type ModuleOptions, _default as default };

package/dist/types.d.ts

@@ -1 +0,0 @@
-export { type ClientOptions, type ModuleOptions, default } from './module'