@sveltejs/kit 1.2.4 → 1.2.6

package/package.json

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

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

@@ -364,10 +364,13 @@ export async function dev(vite, vite_config, svelte_config) {
 				/** @type {function} */ (middleware.handle).name === 'viteServeStaticMiddleware'
 		);
 
+		// Vite will give a 403 on URLs like /test, /static, and /package.json preventing us from
+		// serving routes with those names. See https://github.com/vitejs/vite/issues/7363
 		remove_static_middlewares(vite.middlewares);
 
 		vite.middlewares.use(async (req, res) => {
 			// Vite's base middleware strips out the base path. Restore it
+			const original_url = req.url;
 			req.url = req.originalUrl;
 			try {
 				const base = `${vite.config.server.https ? 'https' : 'http'}://${
@@ -375,13 +378,14 @@ export async function dev(vite, vite_config, svelte_config) {
 				}`;
 
 				const decoded = decodeURI(new URL(base + req.url).pathname);
-				const file = posixify(path.resolve(decoded.slice(1)));
+				const file = posixify(path.resolve(decoded.slice(svelte_config.kit.paths.base.length + 1)));
 				const is_file = fs.existsSync(file) && !fs.statSync(file).isDirectory();
 				const allowed =
 					!vite_config.server.fs.strict ||
 					vite_config.server.fs.allow.some((dir) => file.startsWith(dir));
 
 				if (is_file && allowed) {
+					req.url = original_url;
 					// @ts-expect-error
 					serve_static_middleware.handle(req, res);
 					return;

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

@@ -24,9 +24,6 @@ export async function handle_action_json_request(event, options, server) {
 	const actions = server?.actions;
 
 	if (!actions) {
-		if (server) {
-			maybe_throw_migration_error(server);
-		}
 		// TODO should this be a different error altogether?
 		const no_actions_error = error(405, 'POST method not allowed. No actions exist for this page');
 		return action_json(
@@ -50,6 +47,10 @@ export async function handle_action_json_request(event, options, server) {
 	try {
 		const data = await call_action(event, actions);
 
+		if (__SVELTEKIT_DEV__) {
+			validate_action_return(data);
+		}
+
 		if (data instanceof ActionFailure) {
 			return action_json({
 				type: 'failure',
@@ -124,7 +125,6 @@ export async function handle_action_request(event, server) {
 	const actions = server.actions;
 
 	if (!actions) {
-		maybe_throw_migration_error(server);
 		// TODO should this be a different error altogether?
 		event.setHeaders({
 			// https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/405
@@ -142,13 +142,22 @@ export async function handle_action_request(event, server) {
 	try {
 		const data = await call_action(event, actions);
 
+		if (__SVELTEKIT_DEV__) {
+			validate_action_return(data);
+		}
+
 		if (data instanceof ActionFailure) {
-			return { type: 'failure', status: data.status, data: data.data };
+			return {
+				type: 'failure',
+				status: data.status,
+				data: data.data
+			};
 		} else {
 			return {
 				type: 'success',
 				status: 200,
-				data: /** @type {Record<string, any> | undefined} */ (data)
+				// @ts-expect-error this will be removed upon serialization, so `undefined` is the same as omission
+				data
 			};
 		}
 	} catch (e) {
@@ -185,7 +194,7 @@ function check_named_default_separate(actions) {
  * @param {NonNullable<import('types').SSRNode['server']['actions']>} actions
  * @throws {Redirect | ActionFailure | HttpError | Error}
  */
-export async function call_action(event, actions) {
+async function call_action(event, actions) {
 	const url = new URL(event.request.url);
 
 	let name = 'default';
@@ -213,16 +222,16 @@ export async function call_action(event, actions) {
 	return action(event);
 }
 
-/**
- * @param {import('types').SSRNode['server']} server
- */
-function maybe_throw_migration_error(server) {
-	for (const method of ['POST', 'PUT', 'PATCH', 'DELETE']) {
-		if (/** @type {any} */ (server)[method]) {
-			throw new Error(
-				`${method} method no longer allowed in +page.server, use actions instead. See the PR for more info: https://github.com/sveltejs/kit/pull/6469`
-			);
-		}
+/** @param {any} data */
+function validate_action_return(data) {
+	if (data instanceof Redirect) {
+		throw new Error(`Cannot \`return redirect(...)\` — use \`throw redirect(...)\` instead`);
+	}
+
+	if (data instanceof HttpError) {
+		throw new Error(
+			`Cannot \`return error(...)\` — use \`throw error(...)\` or \`return fail(...)\` instead`
+		);
 	}
 }