@sveltejs/kit 3.0.0-next.2 → 3.0.0-next.21

package/src/exports/vite/module_ids.js

@@ -6,10 +6,10 @@ export const sveltekit_env_public_client = '\0virtual:__sveltekit/env/public/cli
 export const sveltekit_env_public_server = '\0virtual:__sveltekit/env/public/server';
 export const sveltekit_env_private = '\0virtual:__sveltekit/env/private';
 export const sveltekit_env_service_worker = '\0virtual:__sveltekit/env/service-worker';
-
+export const sveltekit_server = '\0virtual:__sveltekit/server';
 export const service_worker = '\0virtual:service-worker';
 
-export const sveltekit_server = '\0virtual:__sveltekit/server';
+export const sveltekit_manifest_data = '\0virtual:__sveltekit/manifest-data';
 
 export const app_server = posixify(
 	fileURLToPath(new URL('../../runtime/app/server/index.js', import.meta.url))

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

@@ -1,25 +1,24 @@
+/** @import { NextHandleFunction } from 'connect' */
+/** @import { PreviewServer, ResolvedConfig } from 'vite' */
+/** @import { ValidatedConfig, ServerInternalModule, ServerModule } from 'types' */
 import fs from 'node:fs';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { lookup } from 'mrmime';
+import { lookup } from '../../../utils/mime.js';
 import sirv from 'sirv';
 import { loadEnv, normalizePath } from 'vite';
 import { createReadableStream, getRequest, setResponse } from '../../../exports/node/index.js';
 import { SVELTE_KIT_ASSETS } from '../../../constants.js';
 import { is_chrome_devtools_request, not_found } from '../utils.js';
-
-/** @typedef {import('http').IncomingMessage} Req */
-/** @typedef {import('http').ServerResponse} Res */
-/** @typedef {(req: Req, res: Res, next: () => void) => void} Handler */
+import { stackless } from '../../../utils/error.js';
 
 /**
- * @param {import('vite').PreviewServer} vite
- * @param {import('vite').ResolvedConfig} vite_config
- * @param {import('types').ValidatedConfig} svelte_config
- * @param {import('@sveltejs/kit').Adapter | undefined} adapter
+ * @param {PreviewServer} vite
+ * @param {ResolvedConfig} vite_config
+ * @param {ValidatedConfig} svelte_config
  */
-export async function preview(vite, vite_config, svelte_config, adapter) {
-	const { paths } = svelte_config.kit;
+export async function preview(vite, vite_config, svelte_config) {
+	const { paths } = svelte_config;
 	const base = paths.base;
 	const assets = paths.assets ? SVELTE_KIT_ASSETS : paths.base;
 
@@ -27,10 +26,10 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 
 	const etag = `"${Date.now()}"`;
 
-	const dir = join(svelte_config.kit.outDir, 'output/server');
+	const dir = join(svelte_config.outDir, 'output/server');
 
-	if (!fs.existsSync(dir)) {
-		throw new Error(`Server files not found at ${dir}, did you run \`build\` first?`);
+	if (!fs.existsSync(`${dir}/manifest.js`)) {
+		throw stackless(`Server files not found at ${dir}, did you run \`build\` first?`);
 	}
 
 	const instrumentation = join(dir, 'instrumentation.server.js');
@@ -38,10 +37,10 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 		await import(pathToFileURL(instrumentation).href);
 	}
 
-	/** @type {import('types').ServerInternalModule} */
+	/** @type {ServerInternalModule} */
 	const { set_assets } = await import(pathToFileURL(join(dir, 'internal.js')).href);
 
-	/** @type {import('types').ServerModule} */
+	/** @type {ServerModule} */
 	const { Server } = await import(pathToFileURL(join(dir, 'index.js')).href);
 
 	const { manifest } = await import(pathToFileURL(join(dir, 'manifest.js')).href);
@@ -49,12 +48,21 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 	set_assets(assets);
 
 	const server = new Server(manifest);
-	await server.init({
-		env: loadEnv(vite_config.mode, svelte_config.kit.env.dir, ''),
-		read: (file) => createReadableStream(`${dir}/${file}`)
-	});
 
-	const emulator = await adapter?.emulate?.();
+	try {
+		await server.init({
+			env: loadEnv(vite_config.mode, svelte_config.env.dir, ''),
+			read: (file) => createReadableStream(`${dir}/${file}`)
+		});
+	} catch (error) {
+		// Vite erases the error message when starting the preview server so we store
+		// it in the stack instead. This ensures errors thrown using `stackless`
+		// are still readable
+		if (error instanceof Error) error.stack = error.message;
+		throw error;
+	}
+
+	const emulator = await svelte_config.adapter?.emulate?.();
 
 	return () => {
 		// Remove the base middleware. It screws with the URL.
@@ -73,10 +81,10 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 		vite.middlewares.use(
 			scoped(
 				assets,
-				sirv(join(svelte_config.kit.outDir, 'output/client'), {
+				sirv(join(svelte_config.outDir, 'output/client'), {
 					setHeaders: (res, pathname) => {
 						// only apply to immutable directory, not e.g. version.json
-						if (pathname.startsWith(`/${svelte_config.kit.appDir}/immutable`)) {
+						if (pathname.startsWith(`/${svelte_config.appDir}/immutable`)) {
 							res.setHeader('cache-control', 'public,max-age=31536000,immutable');
 						}
 					}
@@ -114,7 +122,7 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 
 		// prerendered dependencies
 		vite.middlewares.use(
-			scoped(base, mutable(join(svelte_config.kit.outDir, 'output/prerendered/dependencies')))
+			scoped(base, mutable(join(svelte_config.outDir, 'output/prerendered/dependencies')))
 		);
 
 		// prerendered pages (we can't just use sirv because we need to
@@ -135,10 +143,10 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 
 				const { pathname, search } = new URL(/** @type {string} */ (req.url), 'http://dummy');
 
-				const dir = pathname.startsWith(`/${svelte_config.kit.appDir}/remote/`) ? 'data' : 'pages';
+				const dir = pathname.startsWith(`/${svelte_config.appDir}/remote/`) ? 'data' : 'pages';
 
 				let filename = normalizePath(
-					join(svelte_config.kit.outDir, `output/prerendered/${dir}` + pathname)
+					join(svelte_config.outDir, `output/prerendered/${dir}` + pathname)
 				);
 
 				try {
@@ -196,12 +204,12 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 		vite.middlewares.use(async (req, res) => {
 			const host = req.headers[':authority'] || req.headers.host;
 
-			const request = await getRequest({
+			const request = getRequest({
 				base: `${protocol}://${host}`,
 				request: req
 			});
 
-			await setResponse(
+			setResponse(
 				res,
 				await server.respond(request, {
 					getClientAddress: () => {
@@ -214,7 +222,7 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 							return fs.readFileSync(join(dir, file));
 						}
 
-						return fs.readFileSync(join(svelte_config.kit.files.assets, file));
+						return fs.readFileSync(join(svelte_config.files.assets, file));
 					},
 					emulator
 				})
@@ -225,7 +233,7 @@ export async function preview(vite, vite_config, svelte_config, adapter) {
 
 /**
  * @param {string} dir
- * @returns {Handler}
+ * @returns {NextHandleFunction}
  */
 const mutable = (dir) =>
 	fs.existsSync(dir)
@@ -237,8 +245,8 @@ const mutable = (dir) =>
 
 /**
  * @param {string} scope
- * @param {Handler} handler
- * @returns {Handler}
+ * @param {NextHandleFunction} handler
+ * @returns {NextHandleFunction}
  */
 function scoped(scope, handler) {
 	if (scope === '') return handler;