@sveltejs/kit 1.0.0-next.355 → 1.0.0-next.358

package/assets/server/index.js

@@ -77,13 +77,13 @@ function is_pojo(body) {
 
 	if (body) {
 		if (body instanceof Uint8Array) return false;
+		if (body instanceof ReadableStream) return false;
 
-		// body could be a node Readable, but we don't want to import
-		// node built-ins, so we use duck typing
-		if (body._readableState && typeof body.pipe === 'function') return false;
-
-		// similarly, it could be a web ReadableStream
-		if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) return false;
+		// if body is a node Readable, throw an error
+		// TODO remove this for 1.0
+		if (body._readableState && typeof body.pipe === 'function') {
+			throw new Error('Node streams are no longer supported — use a ReadableStream instead');
+		}
 	}
 
 	return true;
@@ -114,6 +114,8 @@ const text_types = new Set([
 	'multipart/form-data'
 ]);
 
+const bodyless_status_codes = new Set([101, 204, 205, 304]);
+
 /**
  * Decides how the body should be parsed based on its mime type
  *
@@ -217,10 +219,13 @@ async function render_endpoint(event, mod) {
 		}
 	}
 
-	return new Response(method !== 'head' ? normalized_body : undefined, {
-		status,
-		headers
-	});
+	return new Response(
+		method !== 'head' && !bodyless_status_codes.has(status) ? normalized_body : undefined,
+		{
+			status,
+			headers
+		}
+	);
 }
 
 var chars$1 = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_$';
@@ -2279,6 +2284,11 @@ async function load_node({
 						if (cookie) opts.headers.set('cookie', cookie);
 					}
 
+					// we need to delete the connection header, as explained here:
+					// https://github.com/nodejs/undici/issues/1470#issuecomment-1140798467
+					// TODO this may be a case for being selective about which headers we let through
+					opts.headers.delete('connection');
+
 					const external_request = new Request(requested, /** @type {RequestInit} */ (opts));
 					response = await options.hooks.externalFetch.call(null, external_request);
 				}
@@ -3087,7 +3097,12 @@ async function respond(request, options, state) {
 		}
 	}
 
-	let decoded = decodeURI(url.pathname);
+	let decoded;
+	try {
+		decoded = decodeURI(url.pathname);
+	} catch {
+		return new Response('Malformed URI', { status: 400 });
+	}
 
 	/** @type {import('types').SSRRoute | null} */
 	let route = null;
@@ -3097,7 +3112,7 @@ async function respond(request, options, state) {
 
 	if (options.paths.base && !state.prerendering?.fallback) {
 		if (!decoded.startsWith(options.paths.base)) {
-			return new Response(undefined, { status: 404 });
+			return new Response('Not found', { status: 404 });
 		}
 		decoded = decoded.slice(options.paths.base.length) || '/';
 	}

package/dist/chunks/_commonjsHelpers.js

@@ -0,0 +1,3 @@
+var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+
+export { commonjsGlobal as c };

package/dist/chunks/error.js

@@ -224,7 +224,10 @@ const options = object(
 				})
 			}),
 
-			endpointExtensions: string_array(['.js', '.ts']),
+			// TODO: remove this for the 1.0 release
+			endpointExtensions: error(
+				(keypath) => `${keypath} has been renamed to config.kit.moduleExtensions`
+			),
 
 			files: object({
 				assets: string('static'),
@@ -270,6 +273,8 @@ const options = object(
 				})
 			}),
 
+			moduleExtensions: string_array(['.js', '.ts']),
+
 			outDir: string('.svelte-kit'),
 
 			package: object({

package/dist/chunks/index.js

@@ -15255,9 +15255,9 @@ async function preprocess(source, preprocessor, options) {
 /**
  * Resolves the `$lib` alias.
  *
- * TODO: make this more generic to also handle other aliases the user could have defined
- * via `kit.vite.resolve.alias`. Also investigate how to do this in a more robust way
- * (right now regex string replacement is used).
+ * TODO: make this more generic to also handle other aliases the user could have defined via
+ * `kit.alias`. Also investigate how to do this in a more robust way (right now regex string
+ * replacement is used).
  * For more discussion see https://github.com/sveltejs/kit/pull/2453
  *
  * @param {string} file Relative to the lib root

package/dist/chunks/index2.js

@@ -8,20 +8,34 @@ import '@sveltejs/vite-plugin-svelte';
 import 'vite';
 import './sync.js';
 import '../node/polyfills.js';
+import 'assert';
+import 'net';
+import 'http';
+import 'stream';
+import 'buffer';
+import 'util';
+import 'stream/web';
+import 'perf_hooks';
+import 'util/types';
+import 'events';
+import 'tls';
+import './_commonjsHelpers.js';
+import 'async_hooks';
+import 'console';
+import 'zlib';
+import 'crypto';
+import 'querystring';
+import '../node.js';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
 import 'node:stream';
 import 'node:buffer';
-import 'node:util';
 import 'node:url';
+import 'node:util';
 import 'node:net';
 import 'node:fs';
 import 'node:path';
-import 'crypto';
-import 'querystring';
-import '../node.js';
-import 'stream';
 
 /**
  * Creates the Builder which is passed to adapters for building the application.

package/dist/chunks/multipart-parser.js

@@ -1,15 +1,16 @@
 import 'node:fs';
 import 'node:path';
-import { F as FormData, a as File } from '../node/polyfills.js';
+import { F as FormData, a as File } from '../node.js';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
 import 'node:stream';
 import 'node:buffer';
-import 'node:util';
 import 'node:url';
+import 'node:util';
+import './_commonjsHelpers.js';
 import 'node:net';
-import 'crypto';
+import 'stream';
 
 let s = 0;
 const S = {

package/dist/chunks/sync.js

@@ -137,35 +137,6 @@ function logger({ verbose }) {
 	return log;
 }
 
-/**
- * Given an entry point like [cwd]/src/hooks, returns a filename like [cwd]/src/hooks.js or [cwd]/src/hooks/index.js
- * @param {string} entry
- * @returns {string|null}
- */
-function resolve_entry(entry) {
-	if (fs__default.existsSync(entry)) {
-		const stats = fs__default.statSync(entry);
-		if (stats.isDirectory()) {
-			return resolve_entry(path__default.join(entry, 'index'));
-		}
-
-		return entry;
-	} else {
-		const dir = path__default.dirname(entry);
-
-		if (fs__default.existsSync(dir)) {
-			const base = path__default.basename(entry);
-			const files = fs__default.readdirSync(dir);
-
-			const found = files.find((file) => file.replace(/\.[^.]+$/, '') === base);
-
-			if (found) return path__default.join(dir, found);
-		}
-	}
-
-	return null;
-}
-
 /** @param {import('types').ManifestData} manifest_data */
 function get_mime_lookup(manifest_data) {
 	/** @type {Record<string, string>} */
@@ -181,25 +152,6 @@ function get_mime_lookup(manifest_data) {
 	return mime;
 }
 
-/** @param {import('types').ValidatedKitConfig} config */
-function get_aliases(config) {
-	/** @type {Record<string, string>} */
-	const alias = {
-		__GENERATED__: path__default.posix.join(config.outDir, 'generated'),
-		$app: `${get_runtime_path(config)}/app`,
-
-		// For now, we handle `$lib` specially here rather than make it a default value for
-		// `config.kit.alias` since it has special meaning for packaging, etc.
-		$lib: config.files.lib
-	};
-
-	for (const [key, value] of Object.entries(config.alias)) {
-		alias[key] = path__default.resolve(value);
-	}
-
-	return alias;
-}
-
 const param_pattern = /^(\.\.\.)?(\w+)(?:=(\w+))?$/;
 
 /** @param {string} id */
@@ -352,7 +304,7 @@ function create_manifest_data({
 	});
 
 	const routes_base = posixify(path__default.relative(cwd, config.kit.files.routes));
-	const valid_extensions = [...config.extensions, ...config.kit.endpointExtensions];
+	const valid_extensions = [...config.extensions, ...config.kit.moduleExtensions];
 
 	if (fs__default.existsSync(config.kit.files.routes)) {
 		list_files(config.kit.files.routes).forEach((file) => {
@@ -537,6 +489,7 @@ function create_manifest_data({
 	if (fs__default.existsSync(config.kit.files.params)) {
 		for (const file of fs__default.readdirSync(config.kit.files.params)) {
 			const ext = path__default.extname(file);
+			if (!config.kit.moduleExtensions.includes(ext)) continue;
 			const type = file.slice(0, -ext.length);
 
 			if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(type)) {
@@ -943,7 +896,7 @@ function write_types(config, manifest_data) {
 
 		if (file) {
 			const ext = /** @type {string} */ (
-				config.kit.endpointExtensions.find((ext) => file.endsWith(ext))
+				config.kit.moduleExtensions.find((ext) => file.endsWith(ext))
 			);
 			const key = file.slice(0, -ext.length);
 			shadow_types.set(key, {
@@ -1024,4 +977,4 @@ var sync = /*#__PURE__*/Object.freeze({
   all: all
 });
 
-export { get_runtime_path as a, get_mime_lookup as b, all as c, sync as d, get_aliases as g, init as i, logger as l, parse_route_id as p, resolve_entry as r, s, update as u };
+export { get_mime_lookup as a, all as b, sync as c, get_runtime_path as g, init as i, logger as l, parse_route_id as p, s, update as u };

package/dist/cli.js

@@ -41,7 +41,7 @@ async function launch(port, https, base) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}${base}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.355');
+const prog = sade('svelte-kit').version('1.0.0-next.358');
 
 prog
 	.command('dev')
@@ -218,7 +218,7 @@ prog
 
 		try {
 			const config = await load_config();
-			const sync = await import('./chunks/sync.js').then(function (n) { return n.d; });
+			const sync = await import('./chunks/sync.js').then(function (n) { return n.c; });
 			sync.all(config);
 		} catch (error) {
 			handle_error(error);
@@ -242,7 +242,7 @@ prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
 function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	if (open) launch(port, https, base);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.355'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.358'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';