@sveltejs/kit 1.2.8 → 1.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

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

@@ -315,17 +315,30 @@ export async function dev(vite, vite_config, svelte_config) {
 		}
 	});
 
-	// This shameful hack allows us to load runtime server code via Vite
-	// while apps load `HttpError` and `Redirect` in Node, without
-	// causing `instanceof` checks to fail
-	const control_module_node = await import(`../../../runtime/control.js`);
-	const control_module_vite = await vite.ssrLoadModule(`${runtime_base}/control.js`);
-
-	control_module_node.replace_implementations({
-		ActionFailure: control_module_vite.ActionFailure,
-		HttpError: control_module_vite.HttpError,
-		Redirect: control_module_vite.Redirect
-	});
+	async function align_exports() {
+		// This shameful hack allows us to load runtime server code via Vite
+		// while apps load `HttpError` and `Redirect` in Node, without
+		// causing `instanceof` checks to fail
+		const control_module_node = await import(`../../../runtime/control.js`);
+		const control_module_vite = await vite.ssrLoadModule(`${runtime_base}/control.js`);
+
+		control_module_node.replace_implementations({
+			ActionFailure: control_module_vite.ActionFailure,
+			HttpError: control_module_vite.HttpError,
+			Redirect: control_module_vite.Redirect
+		});
+	}
+	align_exports();
+	const ws_send = vite.ws.send;
+	/** @param {any} args */
+	vite.ws.send = function (...args) {
+		// We need to reapply the patch after Vite did dependency optimizations
+		// because that clears the module resolutions
+		if (args[0]?.type === 'full-reload' && args[0].path === '*') {
+			align_exports();
+		}
+		return ws_send.apply(vite.ws, args);
+	};
 
 	vite.middlewares.use(async (req, res, next) => {
 		try {

package/src/runtime/server/page/actions.js

@@ -69,23 +69,23 @@ export async function handle_action_json_request(event, options, server) {
 			});
 		}
 	} catch (e) {
-		const error = normalize_error(e);
+		const err = normalize_error(e);
 
-		if (error instanceof Redirect) {
+		if (err instanceof Redirect) {
 			return action_json({
 				type: 'redirect',
-				status: error.status,
-				location: error.location
+				status: err.status,
+				location: err.location
 			});
 		}
 
 		return action_json(
 			{
 				type: 'error',
-				error: await handle_error_and_jsonify(event, options, check_incorrect_fail_use(error))
+				error: await handle_error_and_jsonify(event, options, check_incorrect_fail_use(err))
 			},
 			{
-				status: error instanceof HttpError ? error.status : 500
+				status: err instanceof HttpError ? err.status : 500
 			}
 		);
 	}
@@ -110,19 +110,18 @@ function action_json(data, init) {
 
 /**
  * @param {import('types').RequestEvent} event
- * @param {import('types').SSRNode} leaf_node
  */
-export function is_action_request(event, leaf_node) {
-	return leaf_node.server && event.request.method !== 'GET' && event.request.method !== 'HEAD';
+export function is_action_request(event) {
+	return event.request.method === 'POST';
 }
 
 /**
  * @param {import('types').RequestEvent} event
- * @param {import('types').SSRNode['server']} server
+ * @param {import('types').SSRNode['server'] | undefined} server
  * @returns {Promise<import('types').ActionResult>}
  */
 export async function handle_action_request(event, server) {
-	const actions = server.actions;
+	const actions = server?.actions;
 
 	if (!actions) {
 		// TODO should this be a different error altogether?
@@ -161,19 +160,19 @@ export async function handle_action_request(event, server) {
 			};
 		}
 	} catch (e) {
-		const error = normalize_error(e);
+		const err = normalize_error(e);
 
-		if (error instanceof Redirect) {
+		if (err instanceof Redirect) {
 			return {
 				type: 'redirect',
-				status: error.status,
-				location: error.location
+				status: err.status,
+				location: err.location
 			};
 		}
 
 		return {
 			type: 'error',
-			error: check_incorrect_fail_use(error)
+			error: check_incorrect_fail_use(err)
 		};
 	}
 }

package/src/runtime/server/page/index.js

@@ -59,7 +59,7 @@ export async function render_page(event, route, page, options, manifest, state,
 		/** @type {import('types').ActionResult | undefined} */
 		let action_result = undefined;
 
-		if (is_action_request(event, leaf_node)) {
+		if (is_action_request(event)) {
 			// for action requests, first call handler in +page.server.js
 			// (this also determines status code)
 			action_result = await handle_action_request(event, leaf_node.server);
@@ -85,7 +85,7 @@ export async function render_page(event, route, page, options, manifest, state,
 
 		if (should_prerender) {
 			const mod = leaf_node.server;
-			if (mod && mod.actions) {
+			if (mod?.actions) {
 				throw new Error('Cannot prerender pages with actions');
 			}
 		} else if (state.prerendering) {