@sveltejs/kit 1.0.0-next.375 → 1.0.0-next.378

package/README.md

@@ -5,7 +5,7 @@ This is the [SvelteKit](https://kit.svelte.dev) framework and CLI.
 The quickest way to get started is via the [create-svelte](https://github.com/sveltejs/kit/tree/master/packages/create-svelte) package:
 
 ```bash
-npm init svelte my-app
+npm create svelte@latest my-app
 cd my-app
 npm install
 npm run dev

package/assets/server/index.js

@@ -145,12 +145,6 @@ function is_pojo(body) {
 	return true;
 }
 
-/** @param {import('types').RequestEvent} event */
-function normalize_request_method(event) {
-	const method = event.request.method.toLowerCase();
-	return method === 'delete' ? 'del' : method; // 'delete' is a reserved word
-}
-
 /**
  * Serialize an error into a JSON string, by copying its `name`, `message`
  * and (in dev) `stack`, plus any custom properties, plus recursively
@@ -192,6 +186,19 @@ function clone_error(error, get_stack) {
 	return object;
 }
 
+// TODO: Remove for 1.0
+/** @param {Record<string, any>} mod */
+function check_method_names(mod) {
+	['get', 'post', 'put', 'patch', 'del'].forEach((m) => {
+		if (m in mod) {
+			const replacement = m === 'del' ? 'DELETE' : m.toUpperCase();
+			throw Error(
+				`Endpoint method "${m}" has changed to "${replacement}". See https://github.com/sveltejs/kit/discussions/5359 for more information.`
+			);
+		}
+	});
+}
+
 /** @type {import('types').SSRErrorPage} */
 const GENERIC_ERROR = {
 	id: '__error'
@@ -238,24 +245,25 @@ function is_text(content_type) {
  * @returns {Promise<Response>}
  */
 async function render_endpoint(event, mod, options) {
-	const method = normalize_request_method(event);
+	const { method } = event.request;
+
+	check_method_names(mod);
 
 	/** @type {import('types').RequestHandler} */
 	let handler = mod[method];
 
-	if (!handler && method === 'head') {
-		handler = mod.get;
+	if (!handler && method === 'HEAD') {
+		handler = mod.GET;
 	}
 
 	if (!handler) {
 		const allowed = [];
 
-		for (const method in ['get', 'post', 'put', 'patch']) {
-			if (mod[method]) allowed.push(method.toUpperCase());
+		for (const method in ['GET', 'POST', 'PUT', 'PATCH', 'DELETE']) {
+			if (mod[method]) allowed.push(method);
 		}
 
-		if (mod.del) allowed.push('DELETE');
-		if (mod.get || mod.head) allowed.push('HEAD');
+		if (mod.GET || mod.HEAD) allowed.push('HEAD');
 
 		return event.request.headers.get('x-sveltekit-load')
 			? // TODO would be nice to avoid these requests altogether,
@@ -263,7 +271,7 @@ async function render_endpoint(event, mod, options) {
 			  new Response(undefined, {
 					status: 204
 			  })
-			: new Response(`${event.request.method} method not allowed`, {
+			: new Response(`${method} method not allowed`, {
 					status: 405,
 					headers: {
 						// https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/405
@@ -327,7 +335,7 @@ async function render_endpoint(event, mod, options) {
 	}
 
 	return new Response(
-		method !== 'head' && !bodyless_status_codes.has(status) ? normalized_body : undefined,
+		method !== 'HEAD' && !bodyless_status_codes.has(status) ? normalized_body : undefined,
 		{
 			status,
 			headers
@@ -2620,13 +2628,15 @@ async function load_shadow_data(route, event, options, prerender) {
 	try {
 		const mod = await route.shadow();
 
-		if (prerender && (mod.post || mod.put || mod.del || mod.patch)) {
+		check_method_names(mod);
+
+		if (prerender && (mod.POST || mod.PUT || mod.DELETE || mod.PATCH)) {
 			throw new Error('Cannot prerender pages that have endpoints with mutative methods');
 		}
 
-		const method = normalize_request_method(event);
-		const is_get = method === 'head' || method === 'get';
-		const handler = method === 'head' ? mod.head || mod.get : mod[method];
+		const { method } = event.request;
+		const is_get = method === 'HEAD' || method === 'GET';
+		const handler = method === 'HEAD' ? mod.HEAD || mod.GET : mod[method];
 
 		if (!handler && !is_get) {
 			return {
@@ -2673,7 +2683,7 @@ async function load_shadow_data(route, event, options, prerender) {
 			data.body = body;
 		}
 
-		const get = (method === 'head' && mod.head) || mod.get;
+		const get = (method === 'HEAD' && mod.HEAD) || mod.GET;
 		if (get) {
 			const { status, headers, body } = validate_shadow_output(await get(event));
 			add_cookies(/** @type {string[]} */ (data.cookies), headers);

package/dist/chunks/index2.js

@@ -83,7 +83,7 @@ function create_builder({ config, build_data, prerendered, log }) {
 					content: segment
 				})),
 				pattern: route.pattern,
-				methods: route.type === 'page' ? ['get'] : build_data.server.methods[route.file]
+				methods: route.type === 'page' ? ['GET'] : build_data.server.methods[route.file]
 			}));
 
 			const seen = new Set();

package/dist/cli.js

@@ -18,7 +18,7 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.375');
+const prog = sade('svelte-kit').version('1.0.0-next.378');
 
 prog
 	.command('package')

package/dist/node.js

@@ -2,7 +2,7 @@ import http from 'node:http';
 import 'node:https';
 import 'node:zlib';
 import Stream, { PassThrough } from 'node:stream';
-import { Buffer as Buffer$1 } from 'node:buffer';
+import { Buffer } from 'node:buffer';
 import { promisify, deprecate, types } from 'node:util';
 import { c as commonjsGlobal } from './chunks/_commonjsHelpers.js';
 import { format } from 'node:url';
@@ -4945,13 +4945,13 @@ class Body {
 			body = null;
 		} else if (isURLSearchParameters(body)) {
 			// Body is a URLSearchParams
-			body = Buffer$1.from(body.toString());
-		} else if (isBlob(body)) ; else if (Buffer$1.isBuffer(body)) ; else if (types.isAnyArrayBuffer(body)) {
+			body = Buffer.from(body.toString());
+		} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (types.isAnyArrayBuffer(body)) {
 			// Body is ArrayBuffer
-			body = Buffer$1.from(body);
+			body = Buffer.from(body);
 		} else if (ArrayBuffer.isView(body)) {
 			// Body is ArrayBufferView
-			body = Buffer$1.from(body.buffer, body.byteOffset, body.byteLength);
+			body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
 		} else if (body instanceof Stream) ; else if (body instanceof FormData) {
 			// Body is FormData
 			body = formDataToBlob(body);
@@ -4959,12 +4959,12 @@ class Body {
 		} else {
 			// None of the above
 			// coerce to string then buffer
-			body = Buffer$1.from(String(body));
+			body = Buffer.from(String(body));
 		}
 
 		let stream = body;
 
-		if (Buffer$1.isBuffer(body)) {
+		if (Buffer.isBuffer(body)) {
 			stream = Stream.Readable.from(body);
 		} else if (isBlob(body)) {
 			stream = Stream.Readable.from(body.stream());
@@ -5106,12 +5106,12 @@ async function consumeBody(data) {
 
 	// Body is null
 	if (body === null) {
-		return Buffer$1.alloc(0);
+		return Buffer.alloc(0);
 	}
 
 	/* c8 ignore next 3 */
 	if (!(body instanceof Stream)) {
-		return Buffer$1.alloc(0);
+		return Buffer.alloc(0);
 	}
 
 	// Body is stream
@@ -5138,10 +5138,10 @@ async function consumeBody(data) {
 	if (body.readableEnded === true || body._readableState.ended === true) {
 		try {
 			if (accum.every(c => typeof c === 'string')) {
-				return Buffer$1.from(accum.join(''));
+				return Buffer.from(accum.join(''));
 			}
 
-			return Buffer$1.concat(accum, accumBytes);
+			return Buffer.concat(accum, accumBytes);
 		} catch (error) {
 			throw new FetchError(`Could not create Buffer from response body for ${data.url}: ${error.message}`, 'system', error);
 		}
@@ -5221,7 +5221,7 @@ const extractContentType = (body, request) => {
 	}
 
 	// Body is a Buffer (Buffer, ArrayBuffer or ArrayBufferView)
-	if (Buffer$1.isBuffer(body) || types.isAnyArrayBuffer(body) || ArrayBuffer.isView(body)) {
+	if (Buffer.isBuffer(body) || types.isAnyArrayBuffer(body) || ArrayBuffer.isView(body)) {
 		return null;
 	}
 
@@ -5745,6 +5745,12 @@ function get_raw_body(req) {
 		return null;
 	}
 
+	if (req.destroyed) {
+		const readable = new ReadableStream();
+		readable.cancel();
+		return readable;
+	}
+
 	let size = 0;
 	let cancelled = false;
 
@@ -5755,31 +5761,34 @@ function get_raw_body(req) {
 			});
 
 			req.on('end', () => {
-				if (!cancelled) {
-					controller.close();
-				}
+				if (cancelled) return;
+				controller.close();
 			});
-		},
 
-		pull(controller) {
-			return new Promise((fulfil) => {
-				req.once('data', (chunk) => {
-					if (!cancelled) {
-						size += chunk.length;
-						if (size > length) {
-							controller.error(new Error('content-length exceeded'));
-						}
+			req.on('data', (chunk) => {
+				if (cancelled) return;
+
+				size += chunk.length;
+				if (size > length) {
+					controller.error(new Error('content-length exceeded'));
+					return;
+				}
 
-						controller.enqueue(chunk);
-					}
+				controller.enqueue(chunk);
 
-					fulfil();
-				});
+				if (controller.desiredSize === null || controller.desiredSize <= 0) {
+					req.pause();
+				}
 			});
 		},
 
-		cancel() {
+		pull() {
+			req.resume();
+		},
+
+		cancel(reason) {
 			cancelled = true;
+			req.destroy(reason);
 		}
 	});
 }
@@ -5831,16 +5840,26 @@ async function setResponse(res, response) {
 	res.writeHead(response.status, headers);
 
 	if (response.body) {
-		let cancelled = false;
-
 		const reader = response.body.getReader();
 
+		if (res.destroyed) {
+			reader.cancel();
+			return;
+		}
+
+		let cancelled = false;
+
 		res.on('close', () => {
 			reader.cancel();
 			cancelled = true;
 		});
 
-		const next = async () => {
+		res.on('error', (error) => {
+			reader.cancel(error);
+			cancelled = true;
+		});
+
+		for (;;) {
 			const { done, value } = await reader.read();
 
 			if (cancelled) return;
@@ -5850,17 +5869,12 @@ async function setResponse(res, response) {
 				return;
 			}
 
-			res.write(Buffer.from(value), (error) => {
-				if (error) {
-					console.error('Error writing stream', error);
-					res.end();
-				} else {
-					next();
-				}
-			});
-		};
+			const ok = res.write(value);
 
-		next();
+			if (!ok) {
+				await new Promise((fulfil) => res.once('drain', fulfil));
+			}
+		}
 	} else {
 		res.end();
 	}

package/dist/vite.js

@@ -4,7 +4,7 @@ import path__default, { join, dirname, resolve as resolve$1, normalize } from 'p
 import { a as load_template, $, c as coalesce_to_error, l as load_config } from './chunks/error.js';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import * as vite from 'vite';
-import { loadConfigFromFile, searchForWorkspaceRoot } from 'vite';
+import { loadConfigFromFile } from 'vite';
 import { p as posixify, m as mkdirp, r as rimraf } from './chunks/write_tsconfig.js';
 import { g as get_runtime_directory, s, i as init, a as get_runtime_prefix, u as update, b as get_mime_lookup, p as parse_route_id, c as all, l as logger } from './chunks/sync.js';
 import { pathToFileURL, URL as URL$1 } from 'url';
@@ -315,6 +315,17 @@ function remove_svelte_kit(config) {
 		.filter((plugin) => plugin.name !== 'vite-plugin-svelte-kit');
 }
 
+const method_names = new Set(['GET', 'HEAD', 'PUT', 'POST', 'DELETE', 'PATCH']);
+
+// If we'd written this in TypeScript, it could be easy...
+/**
+ * @param {string} str
+ * @returns {str is import('types').HttpMethod}
+ */
+function is_http_method(str) {
+	return method_names.has(str);
+}
+
 /**
  * @param {{
  *   hooks: string;
@@ -563,16 +574,6 @@ async function build_server(options, client) {
 	};
 }
 
-/** @type {Record<string, string>} */
-const method_names = {
-	get: 'get',
-	head: 'head',
-	post: 'post',
-	put: 'put',
-	del: 'delete',
-	patch: 'patch'
-};
-
 /**
  * @param {string} cwd
  * @param {import('rollup').OutputChunk[]} output
@@ -593,9 +594,7 @@ function get_methods(cwd, output, manifest_data) {
 		const file = route.type === 'endpoint' ? route.file : route.shadow;
 
 		if (file && lookup[file]) {
-			methods[file] = lookup[file]
-				.map((x) => /** @type {import('types').HttpMethod} */ (method_names[x]))
-				.filter(Boolean);
+			methods[file] = lookup[file].filter(is_http_method);
 		}
 	});
 
@@ -2987,7 +2986,7 @@ function kit() {
 								svelte_config.kit.outDir,
 								path__default.resolve(cwd, 'src'),
 								path__default.resolve(cwd, 'node_modules'),
-								path__default.resolve(searchForWorkspaceRoot(cwd), 'node_modules')
+								path__default.resolve(vite.searchForWorkspaceRoot(cwd), 'node_modules')
 							])
 						]
 					},
@@ -3014,6 +3013,9 @@ function kit() {
 		 * Clears the output directories.
 		 */
 		buildStart() {
+			// Reset for new build. Goes here because `build --watch` calls buildStart but not config
+			completed_build = false;
+
 			if (is_build) {
 				rimraf(paths.build_dir);
 				mkdirp(paths.build_dir);
@@ -3164,18 +3166,14 @@ function kit() {
 }
 
 function check_vite_version() {
-	let vite_major = 3;
-
-	try {
-		const pkg = JSON.parse(fs__default.readFileSync('package.json', 'utf-8'));
-		vite_major = +pkg.devDependencies['vite'].replace(/^[~^]/, '')[0];
-	} catch {
-		// do nothing
-	}
+	// TODO parse from kit peer deps and maybe do a full semver compare if we ever require feature releases a min
+	const min_required_vite_major = 3;
+	const vite_version = vite.version ?? '2.x'; // vite started exporting it's version in 3.0
+	const current_vite_major = parseInt(vite_version.split('.')[0], 10);
 
-	if (vite_major < 3) {
+	if (current_vite_major < min_required_vite_major) {
 		throw new Error(
-			`Vite version ${vite_major} is no longer supported. Please upgrade to version 3`
+			`Vite version ${current_vite_major} is no longer supported. Please upgrade to version ${min_required_vite_major}`
 		);
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.375",
+  "version": "1.0.0-next.378",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -15,7 +15,7 @@
     "sade": "^1.8.1"
   },
   "devDependencies": {
-    "@playwright/test": "^1.23.3",
+    "@playwright/test": "^1.23.4",
     "@rollup/plugin-replace": "^4.0.0",
     "@types/connect": "^3.4.35",
     "@types/cookie": "^0.5.1",

package/types/index.d.ts

@@ -244,7 +244,7 @@ export interface RequestEvent<Params extends Record<string, string> = Record<str
 }
 
 /**
- * A `(event: RequestEvent) => RequestHandlerOutput` function exported from an endpoint that corresponds to an HTTP verb (`get`, `put`, `patch`, etc) and handles requests with that method. Note that since 'delete' is a reserved word in JavaScript, delete handles are called `del` instead.
+ * A `(event: RequestEvent) => RequestHandlerOutput` function exported from an endpoint that corresponds to an HTTP verb (`GET`, `PUT`, `PATCH`, etc) and handles requests with that method.
  *
  * It receives `Params` as the first generic argument, which you can skip by using [generated types](/docs/types#generated-types) instead.
  *

package/types/private.d.ts

@@ -142,7 +142,7 @@ export interface CspDirectives {
 	>;
 }
 
-export type HttpMethod = 'get' | 'head' | 'post' | 'put' | 'delete' | 'patch';
+export type HttpMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
 
 export interface JSONObject {
 	[key: string]: JSONValue;