@serwist/nuxt 10.0.0-preview.1 → 10.0.0-preview.2

package/dist/module.d.mts

@@ -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

@@ -5,9 +5,9 @@
     "nuxt": "^3.8.0",
     "bridge": false
   },
-  "version": "10.0.0-preview.1",
+  "version": "10.0.0-preview.2",
   "builder": {
-    "@nuxt/module-builder": "0.8.4",
+    "@nuxt/module-builder": "1.0.1",
     "unbuild": "unknown"
   }
 }

package/dist/module.mjs

@@ -1,128 +1,19 @@
 import path from 'node:path';
 import { defineNuxtModule, createResolver, addPlugin, extendWebpackConfig } from '@nuxt/kit';
-import { resolveEntry, createContext, main as main$1, dev, generateServiceWorker } from 'vite-plugin-serwist';
+import { resolveEntry } from '@serwist/utils/node';
+import { createContext, main, dev, generateServiceWorker } from 'vite-plugin-serwist';
 import { createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
 import fsp from 'node:fs/promises';
 
-const name = "@serwist/nuxt";
-const version = "10.0.0-preview.1";
-const type = "module";
-const description = "A Nuxt module that integrates Serwist into your application.";
-const files = [
-	"dist"
-];
-const keywords = [
-	"nuxt",
-	"pwa",
-	"vite",
-	"vite-plugin",
-	"serwist",
-	"serwistjs",
-	"pwa",
-	"sw",
-	"service worker",
-	"web",
-	"service-worker",
-	"nuxt-module"
-];
-const engines = {
-	node: ">=18.0.0"
-};
-const repository = "https://github.com/serwist/serwist";
-const bugs = "https://github.com/serwist/serwist/issues";
-const homepage = "https://serwist.pages.dev";
-const main = "./dist/module.mjs";
-const types = "./dist/types.d.ts";
-const exports = {
-	".": {
-		types: "./dist/types.d.mts",
-		"default": "./dist/module.mjs"
-	}
-};
-const build = {
-	externals: [
-		"node:child_process",
-		"node:fs",
-		"node:path",
-		"consola",
-		"esbuild",
-		"rollup",
-		"vite",
-		"@nuxt/kit",
-		"@serwist/build",
-		"vite-plugin-serwist",
-		"virtual:serwist-nuxt-configuration",
-		"virtual:serwist"
-	]
-};
-const scripts = {
-	build: "nuxt-module-build prepare && nuxt-module-build build",
-	dev: "nuxi dev playground --port 5173",
-	"dev:generate": "nuxi generate playground",
-	"dev:generate:netlify": "NITRO_PRESET=netlify nuxi generate playground",
-	"dev:generate:vercel": "NITRO_PRESET=vercel nuxi generate playground",
-	"dev:build": "nuxi build playground",
-	"dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
-	"dev:preview:build": "nr dev:build && node playground/.output/server/index.mjs",
-	"dev:preview:generate": "nr dev:generate && serve playground/dist"
-};
-const dependencies = {
-	"@nuxt/kit": "3.15.4",
-	"@serwist/build": "workspace:*",
-	"vite-plugin-serwist": "workspace:*",
-	"@serwist/window": "workspace:*"
-};
-const devDependencies = {
-	"@nuxt/module-builder": "0.8.4",
-	"@nuxt/schema": "3.15.4",
-	"@serwist/configs": "workspace:*",
-	"@types/node": "22.13.5",
-	eslint: "9.21.0",
-	nuxt: "3.15.4",
-	rimraf: "5.0.9",
-	serve: "14.2.4",
-	typescript: "5.7.3",
-	vite: "6.1.1",
-	"vue-tsc": "2.2.4"
-};
-const peerDependencies = {
-	typescript: ">=5.0.0",
-	vite: "^5.0.0"
-};
-const peerDependenciesMeta = {
-	typescript: {
-		optional: true
-	}
-};
+const version = "10.0.0-preview.2";
 const packageJson = {
-	name: name,
-	version: version,
-	type: type,
-	description: description,
-	files: files,
-	keywords: keywords,
-	engines: engines,
-	repository: repository,
-	bugs: bugs,
-	homepage: homepage,
-	main: main,
-	types: types,
-	exports: exports,
-	build: build,
-	scripts: scripts,
-	dependencies: dependencies,
-	devDependencies: devDependencies,
-	peerDependencies: peerDependencies,
-	peerDependenciesMeta: peerDependenciesMeta
-};
+	version: version};
 
 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);
   }
@@ -178,10 +69,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);
       }
@@ -223,8 +112,7 @@ const module = defineNuxtModule({
     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"),
@@ -244,11 +132,9 @@ const module = defineNuxtModule({
       }
     });
     nuxt.hook("vite:extendConfig", async (viteInlineConfig, { isClient }) => {
-      if (!viteInlineConfig.plugins)
-        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'.");
+      if (plugin) throw new Error("Remove 'vite-plugin-serwist' from your Vite configuration! Do not use it alongside '@serwist/nuxt'.");
       if (isClient) {
         const configuration = "virtual:serwist-nuxt-configuration";
         const resolvedConfiguration = `\0${configuration}`;
@@ -270,15 +156,14 @@ const module = defineNuxtModule({
         });
       }
       ctx = createContext(userOptions, "nuxt");
-      viteInlineConfig.plugins.push(main$1(ctx), dev(ctx));
+      viteInlineConfig.plugins.push(main(ctx), dev(ctx));
     });
     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 (ctx && !ctx.options.disable) void generateServiceWorker(ctx);
       });
     }
   }

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": "10.0.0-preview.1",
+  "version": "10.0.0-preview.2",
   "type": "module",
   "description": "A Nuxt module that integrates Serwist into your application.",
   "files": [
@@ -8,6 +8,7 @@
   ],
   "keywords": [
     "nuxt",
+    "nuxt-module",
     "pwa",
     "vite",
     "vite-plugin",
@@ -17,17 +18,15 @@
     "sw",
     "service worker",
     "web",
-    "service-worker",
-    "nuxt-module"
+    "service-worker"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "repository": "https://github.com/serwist/serwist",
   "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",
@@ -51,27 +50,28 @@
     ]
   },
   "dependencies": {
-    "@nuxt/kit": "3.15.4",
-    "@serwist/build": "10.0.0-preview.1",
-    "vite-plugin-serwist": "10.0.0-preview.1",
-    "@serwist/window": "10.0.0-preview.1"
+    "@nuxt/kit": "3.16.2",
+    "@serwist/build": "10.0.0-preview.2",
+    "@serwist/utils": "10.0.0-preview.2",
+    "@serwist/window": "10.0.0-preview.2",
+    "vite-plugin-serwist": "10.0.0-preview.2"
   },
   "devDependencies": {
-    "@nuxt/module-builder": "0.8.4",
-    "@nuxt/schema": "3.15.4",
-    "@types/node": "22.13.5",
-    "eslint": "9.21.0",
-    "nuxt": "3.15.4",
-    "rimraf": "5.0.9",
+    "@nuxt/module-builder": "1.0.1",
+    "@nuxt/schema": "3.16.2",
+    "@types/node": "22.14.1",
+    "eslint": "9.25.0",
+    "nuxt": "3.16.2",
+    "rimraf": "6.0.1",
     "serve": "14.2.4",
-    "typescript": "5.7.3",
-    "vite": "6.1.1",
-    "vue-tsc": "2.2.4",
-    "@serwist/configs": "10.0.0-preview.1"
+    "typescript": "5.8.3",
+    "vite": "6.3.2",
+    "vue-tsc": "2.2.8",
+    "@serwist/configs": "10.0.0-preview.2"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",
-    "vite": "^5.0.0"
+    "vite": "^5.0.0 || ^6.0.0"
   },
   "peerDependenciesMeta": {
     "typescript": {

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'