@sveltejs/kit 3.0.0-next.24 → 3.0.0-next.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "3.0.0-next.24",
+  "version": "3.0.0-next.25",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -148,6 +148,10 @@
       "types": "./types/index.d.ts",
       "import": "./src/exports/internal/server/index.js"
     },
+    "./adapter": {
+      "types": "./types/index.d.ts",
+      "import": "./src/exports/adapter.js"
+    },
     "./node": {
       "types": "./types/index.d.ts",
       "import": "./src/exports/node/index.js"
@@ -180,9 +184,13 @@
     "format": "oxfmt --write .",
     "test": "pnpm test:unit && pnpm test:integration",
     "test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test",
-    "test:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:dev",
-    "test:build": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:build",
-    "test:cross-platform:dev": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:dev",
+    "test:dev": "pnpm -r --workspace-concurrency 2 --filter=\"./test/**\" test:dev",
+    "test:build": "pnpm -r --workspace-concurrency 2 --filter=\"./test/**\" test:build",
+    "test:dev:basics": "pnpm --filter=test-basics test:dev",
+    "test:dev:rest": "pnpm -r --workspace-concurrency 2 --filter=\"./test/**\" --filter=\"!test-basics\" test:dev",
+    "test:build:basics": "pnpm --filter=test-basics test:build",
+    "test:build:rest": "pnpm -r --workspace-concurrency 2 --filter=\"./test/**\" --filter=\"!test-basics\" test:build",
+    "test:cross-platform:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:dev",
     "test:cross-platform:build": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:build",
     "test:server-side-route-resolution:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:server-side-route-resolution:dev",
     "test:server-side-route-resolution:build": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:server-side-route-resolution:build",

package/src/constants.js

@@ -28,3 +28,9 @@ export const SRC_ROOT = import.meta.dirname;
 
 // eslint-disable-next-line n/prefer-global/process
 export const IN_WEBCONTAINER = !!globalThis.process?.versions?.webcontainer;
+
+/**
+ * If an an adapter deploys a catch-all serverless function, the rerouted URL
+ * is stored in this header.
+ */
+export const REROUTED_URL_HEADER = 'x-sveltekit-rerouted-url';

package/src/core/adapt/builder.js

@@ -1,7 +1,6 @@
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
-/** @import { Builder } from '@sveltejs/kit' */
 /** @import { ResolvedConfig } from 'vite' */
-/** @import { RouteDefinition } from '@sveltejs/kit' */
+/** @import { Builder, RouteDefinition } from '@sveltejs/kit' */
 /** @import { EnvVarConfig } from '@sveltejs/kit/env' */
 /** @import { RouteData, ValidatedConfig, BuildData, ServerMetadata, ServerMetadataRoute, Prerendered, PrerenderMap, Logger, RemoteChunk } from 'types' */
 import { loadEnv } from 'vite';

package/src/core/env.js

@@ -4,13 +4,12 @@
 import path from 'node:path';
 import * as devalue from 'devalue';
 import { dedent } from './sync/utils.js';
-import { runtime_directory } from './utils.js';
+import { get_global_name, runtime_directory } from './utils.js';
 import { resolve_entry } from '../utils/filesystem.js';
 import { handle_issues, validate } from '../exports/internal/env.js';
 import { get_config_aliases } from '../exports/vite/utils.js';
 import { get_runner } from '../runner.js';
 import { import_peer } from '../utils/import.js';
-import { hash } from '../utils/hash.js';
 import { posixify } from '../utils/os.js';
 
 /**
@@ -216,9 +215,7 @@ export function create_env_modules(config, variables, env, dir, entry, is_dev) {
 	 */
 	const module = (prelude, exports) => (variables ? `${prelude}\n\n${exports.join('')}` : '');
 
-	const global = is_dev
-		? 'globalThis.__sveltekit_dev'
-		: `globalThis.__sveltekit_${hash(config.version.name)}`;
+	const global = `globalThis.${get_global_name(config.version.name, is_dev)}`;
 
 	const version = JSON.stringify(config.version.name);
 
@@ -257,7 +254,7 @@ export function create_env_modules(config, variables, env, dir, entry, is_dev) {
 		),
 		'public/client.js': module(
 			is_dev
-				? `const { env } = globalThis.__sveltekit_dev;`
+				? `const { env } = ${global};`
 				: `import { payload } from ${JSON.stringify(posixify(path.relative(`${dir}/public`, `${runtime_directory}/client/payload.js`)))};\nconst env = payload.env;`,
 			public_exports
 		),

package/src/core/postbuild/prerender.js

@@ -52,7 +52,7 @@ async function prerender({
 	const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
 
 	/** @type {import('types').ServerInternalModule} */
-	const { set_building, set_prerendering, set_manifest, set_read_implementation, log_response } =
+	const { set_building, set_prerendering, set_manifest, set_read_implementation, format_response } =
 		await import(pathToFileURL(`${out}/server/internal.js`).href);
 
 	// configure `import { building } from `$app/env` —
@@ -424,7 +424,7 @@ async function prerender({
 		}
 
 		if (response.status >= 400) {
-			log_response(response.status, request);
+			console.log(format_response(response.status, request));
 		}
 
 		const body = Buffer.from(await response.arrayBuffer());

package/src/core/sync/write_server.js

@@ -1,5 +1,4 @@
 import path from 'node:path';
-import { hash } from '../../utils/hash.js';
 import { resolve_entry } from '../../utils/filesystem.js';
 import { posixify } from '../../utils/os.js';
 import { s } from '../../utils/misc.js';
@@ -13,7 +12,6 @@ import { runtime_directory } from '../utils.js';
  *   server_hooks: string | null;
  *   universal_hooks: string | null;
  *   config: import('types').ValidatedConfig;
- *   has_service_worker: boolean;
  *   template: string;
  *   runtime_directory: string;
  * }} opts
@@ -22,26 +20,18 @@ const server_template = ({
 	config,
 	server_hooks,
 	universal_hooks,
-	has_service_worker,
 	template,
 	runtime_directory
 }) => `
 import { set_building, set_prerendering } from '$app/env/server';
 import { set_assets } from '$app/paths/internal/server';
-import { set_fix_stack_trace, set_manifest, set_read_implementation, log_response } from '${runtime_directory}/server/internal.js';
+import { set_fix_stack_trace, set_manifest, set_read_implementation, format_response } from '${runtime_directory}/server/internal.js';
 import error from './shared/error-template.js';
 
 export const options = {
 	app_template_contains_nonce: ${template.includes('%sveltekit.nonce%')},
 	csp: ${s(config.csp)},
-	csrf_check_origin: ${s(!config.csrf.trustedOrigins.includes('*'))},
 	csrf_trusted_origins: ${s(config.csrf.trustedOrigins)},
-	embedded: ${config.embedded},
-	hash_routing: ${s(config.router.type === 'hash')},
-	hooks: null, // added lazily, via \`get_hooks\`
-	link_header_preload: ${s(config.output.linkHeaderPreload)},
-	paths_origin: ${s(config.paths.origin)},
-	service_worker: ${has_service_worker},
 	service_worker_options: ${config.serviceWorker.register ? s(config.serviceWorker.options) : 'null'},
 	templates: {
 		app: ({ head, body, assets, nonce, env }) => ${s(template)
@@ -55,9 +45,7 @@ export const options = {
 				(_match, capture) => `" + (env[${s(capture)}] ?? "") + "`
 			)},
 		error
-	},
-	version: ${s(config.version.name)},
-	version_hash: ${s(hash(config.version.name))}
+	}
 };
 
 export async function get_hooks() {
@@ -81,7 +69,7 @@ export async function get_hooks() {
 	};
 }
 
-export { set_assets, set_building, set_fix_stack_trace, set_manifest, set_prerendering, set_read_implementation, log_response };
+export { set_assets, set_building, set_fix_stack_trace, set_manifest, set_prerendering, set_read_implementation, format_response };
 `;
 
 /**
@@ -125,8 +113,6 @@ export function write_server(config, output, root) {
 			runtime_directory: relative(runtime_directory),
 			server_hooks: server_hooks_file ? relative(server_hooks_file) : null,
 			universal_hooks: universal_hooks_file ? relative(universal_hooks_file) : null,
-			has_service_worker:
-				config.serviceWorker.register && !!resolve_entry(config.files.serviceWorker),
 			template: load_template(root, config)
 		})
 	);

package/src/core/utils.js

@@ -4,6 +4,7 @@ import { styleText } from 'node:util';
 import { to_fs } from '../utils/vite.js';
 import { noop } from '../utils/functions.js';
 import { posixify } from '../utils/os.js';
+import { hash } from '../utils/hash.js';
 
 /**
  * Resolved path of the `runtime` directory posix-ified
@@ -15,6 +16,15 @@ import { posixify } from '../utils/os.js';
  */
 export const runtime_directory = posixify(fileURLToPath(new URL('../runtime', import.meta.url)));
 
+/**
+ * The name of the `globalThis.__sveltekit_xxx` object the app's payload is attached to
+ * @param {string} version_name
+ * @param {boolean} dev
+ */
+export function get_global_name(version_name, dev) {
+	return dev ? '__sveltekit_dev' : `__sveltekit_${hash(version_name)}`;
+}
+
 /**
  * This allows us to import SvelteKit internals that aren't exposed via `pkg.exports` in a
  * way that works whether `@sveltejs/kit` is installed inside the project's `node_modules`

package/src/exports/adapter.js

@@ -0,0 +1,22 @@
+import { REROUTED_URL_HEADER } from '../constants.js';
+
+/**
+ * Helps a catch-all request handler pass the request to a different handler if
+ * the `reroute` hook has returned a URL pathname that's different from the
+ * incoming request.
+ *
+ * If your adapter is capable of deploying multiple serverless functions, it's a
+ * good idea to also deploy a "catch-all" one to handle uncaught requests.
+ * Running this in that function allows the app's `reroute` hook to rewrite
+ * the request URL and invoke the next appropriate serverless function, if any.
+ * @param {Response} response The response returned from the SvelteKit `server.respond` function
+ * @param {(url: URL) => Response | Promise<Response>} next Your platform-specific implementation for invoking the next handler with a different request URL
+ * @returns {Response | Promise<Response>}
+ * @since 3.0.0
+ */
+export function applyReroute(response, next) {
+	const rerouted_url = response.headers.get(REROUTED_URL_HEADER);
+	if (!rerouted_url) return response;
+
+	return next(new URL(rerouted_url));
+}

package/src/exports/public.d.ts

@@ -165,7 +165,7 @@ export interface Builder {
 	/**
 	 * Generate a server-side manifest to initialise the SvelteKit [server](https://svelte.dev/docs/kit/@sveltejs-kit#Server) with.
 	 * @param opts
-	 * @param opts.relativePath  A relative path to the base directory of the server build output
+	 * @param opts.relativePath A relative path to the base directory of the server build output
 	 */
 	generateManifest: (opts: { relativePath: string; routes?: RouteDefinition[] }) => string;
 

package/src/exports/vite/build/service-worker.js

@@ -0,0 +1,98 @@
+/** @import { ValidatedConfig } from 'types' */
+/** @import { Plugin, UserConfig } from 'vite' */
+import { runtime_directory } from '../../../core/utils.js';
+import { warn_overridden_config } from '../utils.js';
+
+/**
+ * @param {ValidatedConfig} kit
+ * @param {() => { service_worker_entry_file: string | null; kit_global: string; out: string; initial_config: UserConfig; }} get_config
+ * @returns {Plugin}
+ */
+export function plugin_service_worker_build(kit, get_config) {
+	return {
+		name: 'vite-plugin-sveltekit-service-worker',
+
+		config(config) {
+			const { service_worker_entry_file, kit_global, out, initial_config } = get_config();
+
+			if (!service_worker_entry_file) return;
+
+			if (kit.paths.assets) {
+				throw new Error('Cannot use service worker alongside config.paths.assets');
+			}
+
+			const user_service_worker_output_config =
+				config.environments?.serviceWorker?.build?.rolldownOptions?.output;
+
+			/** @type {UserConfig} */
+			const new_config = {
+				environments: {
+					serviceWorker: {
+						define: {
+							__SVELTEKIT_PAYLOAD__: kit_global
+						},
+						build: {
+							modulePreload: false,
+							rolldownOptions: {
+								external: [`${kit.paths.base}/${kit.appDir}/env.js`],
+								input: {
+									'service-worker': service_worker_entry_file
+								},
+								output: {
+									format: 'es',
+									entryFileNames: 'service-worker.js',
+									assetFileNames: `${kit.appDir}/immutable/assets/[name].[hash][extname]`,
+									codeSplitting:
+										(Array.isArray(user_service_worker_output_config)
+											? user_service_worker_output_config[0].codeSplitting
+											: user_service_worker_output_config?.codeSplitting) ?? false
+								}
+							},
+							outDir: `${out}/client`,
+							minify: initial_config.build?.minify,
+							// avoid overwriting the client build Vite manifest
+							manifest: '.vite/service-worker-manifest.json'
+						},
+						consumer: 'client'
+					}
+				}
+			};
+
+			warn_overridden_config(config, new_config);
+
+			return new_config;
+		},
+
+		// our serviceWorker environment only exists when building because Vite only
+		// supports the default client environment during development (for now)
+		applyToEnvironment(environment) {
+			return environment.name === 'serviceWorker';
+		},
+
+		generateBundle(_, bundle) {
+			const invalid_modules = new Set();
+			const modules = new Map([
+				[`${runtime_directory}/app/forms/index.js`, '$app/forms'],
+				[`${runtime_directory}/app/navigation/index.js`, '$app/navigation'],
+				[`${runtime_directory}/app/state/index.js`, '$app/state']
+			]);
+
+			for (const output of Object.values(bundle)) {
+				if (output.type !== 'chunk') continue;
+
+				for (const id of output.moduleIds) {
+					const module = modules.get(id);
+					if (module) invalid_modules.add(module);
+				}
+			}
+
+			if (invalid_modules.size > 0) {
+				throw new Error(
+					`Cannot import ${Array.from(modules.values())
+						.filter((module) => invalid_modules.has(module))
+						.join(', ')} into service-worker code.`
+				);
+			}
+		}
+	};
+}

package/src/exports/vite/dev/index.js

@@ -89,6 +89,20 @@ export async function dev(
 
 	const runner = get_runner(vite, vite_dev_server);
 
+	/**
+	 * Log a response to the console, routed through Vite's logger so that it
+	 * respects the configured `logLevel` and any `customLogger`
+	 * @param {number} status
+	 * @param {string} log
+	 */
+	function log_dev_response(status, log) {
+		if (status < 400) {
+			vite_dev_server.config.logger.info(log);
+		} else {
+			vite_dev_server.config.logger.error(log);
+		}
+	}
+
 	/**
 	 * @param {string} url
 	 * @returns {Promise<Record<string, any>>}
@@ -580,7 +594,7 @@ export async function dev(
 					await runner.import(`${get_runtime_base(root)}/server/index.js`)
 				);
 
-				const { set_fix_stack_trace, log_response } = await runner.import(
+				const { set_fix_stack_trace, format_response } = await runner.import(
 					`${get_runtime_base(root)}/server/internal.js`
 				);
 				set_fix_stack_trace(fix_stack_trace);
@@ -647,11 +661,11 @@ export async function dev(
 				if (rendered.status === 404) {
 					// @ts-expect-error
 					serve_static_middleware.handle(req, res, () => {
-						log_response(rendered.status, request);
+						log_dev_response(rendered.status, format_response(rendered.status, request));
 						setResponse(res, rendered);
 					});
 				} else {
-					log_response(rendered.status, request);
+					log_dev_response(rendered.status, format_response(rendered.status, request));
 					setResponse(res, rendered);
 				}
 			} catch (e) {