Fix broken path resolution 🤷

Author: thomasfosterau

packages/kit/src/core/config/index.js

@@ -94,6 +94,7 @@ function process_config(config, { cwd = process.cwd() } = {}) {
 		if (key === 'hooks') {
 			validated.kit.files.hooks.client = path.resolve(cwd, validated.kit.files.hooks.client);
 			validated.kit.files.hooks.server = path.resolve(cwd, validated.kit.files.hooks.server);
+			validated.kit.files.hooks.serviceWorker = path.resolve(cwd, validated.kit.files.hooks.serviceWorker);
 			validated.kit.files.hooks.universal = path.resolve(cwd, validated.kit.files.hooks.universal);
 		} else {
 			// @ts-expect-error

packages/kit/src/core/config/options.js

@@ -125,6 +125,7 @@ const options = object(
 				hooks: object({
 					client: string(join('src', 'hooks.client')),
 					server: string(join('src', 'hooks.server')),
+					serviceWorker: string(join('src', 'hooks.worker')),
 					universal: string(join('src', 'hooks'))
 				}),
 				lib: string(join('src', 'lib')),

packages/kit/src/exports/vite/build/build_service_worker.js

@@ -3,7 +3,7 @@ import path, { basename, } from 'node:path';
 import process from 'node:process';
 import * as vite from 'vite';
 import { create_static_module } from '../../../core/env.js';
-import { generate_manifest } from '../../../core/generate_manifest/index.js';
+import {  generate_service_worker_manifest } from '../../../core/generate_manifest/index.js';
 import { dedent } from '../../../core/sync/utils.js';
 import { mkdirp } from '../../../utils/filesystem.js';
 import { s } from '../../../utils/misc.js';
@@ -80,17 +80,15 @@ export async function build_service_worker(
 	const route_data = build_data.manifest_data.routes.filter((route) => route.page);
 
 	writeFileSync(
-		`${kit.outDir}/output/service-worker/index.js`,
+		`${out}/service-worker/index.js`,
 		dedent`
-		const manifest = ${generate_manifest({
+		const manifest = ${generate_service_worker_manifest({
 				build_data,
 				prerendered: prerendered.paths,
-				relative_path: path.posix.relative(`${kit.outDir}/output/service-worker`, `${kit.outDir}/output/service-worker`),
+				relative_path: path.posix.relative(`${out}/service-worker`, `${out}/service-worker`),
 				routes:  route_data.filter((route) => prerender_map.get(route.id) !== true)
 		})};
 			
-		const prerendered = new Set(${JSON.stringify(prerendered.paths)});
-
 		export const base = /*@__PURE__*/ ${base};
 
 		export const build = [
@@ -143,7 +141,7 @@ export async function build_service_worker(
 		publicDir: false,
 		plugins: [sw_virtual_modules],
 		resolve: {
-			alias: [...get_config_aliases(kit), { find: "$service-worker", replacement: path.relative(service_worker_entry_file, `${out}/service-worker/service-worker.js`) }]
+			alias: [...get_config_aliases(kit), { find: "$service-worker", replacement: `${out}/service-worker/index.js` }]
 		},
 		experimental: {
 			renderBuiltUrl(filename) {

packages/kit/src/exports/vite/dev/index.js

@@ -387,12 +387,6 @@ export async function dev(vite, vite_config, svelte_config) {
 		}
 	});
 
-	vite.watcher.on('all', (_, file) => {
-		if (file === appTemplate || file === errorTemplate || file.startsWith(hooks.server)) {
-			sync.service_worker(svelte_config);
-		}
-	});
-
 	// changing the svelte config requires restarting the dev server
 	// the config is only read on start and passed on to vite-plugin-svelte
 	// which needs up-to-date values to operate correctly

packages/kit/src/types/ambient.d.ts

@@ -79,7 +79,7 @@ declare module '$service-worker' {
 	 */
 	export const version: string;
 	/**
-	 *
+	 * This function can be used to respond to a `FetchEvent` using SvelteKit.  
 	 */
 	export const respond: (event: Request) => Promise<Response>;
 }