@sveltejs/kit 1.20.2 → 1.20.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.20.2",
+  "version": "1.20.4",
   "description": "The fastest way to build Svelte apps",
   "repository": {
     "type": "git",
@@ -22,7 +22,6 @@
     "sade": "^1.8.1",
     "set-cookie-parser": "^2.6.0",
     "sirv": "^2.0.2",
-    "tiny-glob": "^0.2.9",
     "undici": "~5.22.0"
   },
   "devDependencies": {

package/postinstall.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import glob from 'tiny-glob/sync.js';
 import { load_config } from './src/core/config/index.js';
+import { list_files } from './src/core/utils.js';
 import * as sync from './src/core/sync/sync.js';
 
 try {
@@ -18,7 +18,7 @@ try {
 			const packages = Array.isArray(pkg.workspaces) ? pkg.workspaces : pkg.workspaces.packages;
 
 			for (const directory of packages) {
-				directories.push(...glob(directory, { cwd }).map((dir) => path.resolve(cwd, dir)));
+				directories.push(...list_files(directory).map((dir) => path.resolve(cwd, dir)));
 			}
 		} else {
 			directories.push(cwd);
@@ -37,11 +37,11 @@ try {
 				const config = await load_config();
 				await sync.all(config, 'development');
 			} catch (error) {
-				console.log('Error while trying to sync SvelteKit config');
-				console.log(error.stack);
+				console.error('Error while trying to sync SvelteKit config');
+				console.error(error);
 			}
 		}
 	}
 } catch (error) {
-	console.error(error.stack);
+	console.error(error);
 }

package/src/core/adapt/builder.js

@@ -1,17 +1,18 @@
 import { existsSync, statSync, createReadStream, createWriteStream } from 'node:fs';
-import { join } from 'node:path/posix';
+import { extname, join } from 'node:path/posix';
 import { pipeline } from 'node:stream';
 import { promisify } from 'node:util';
 import zlib from 'node:zlib';
-import glob from 'tiny-glob';
 import { copy, rimraf, mkdirp } from '../../utils/filesystem.js';
 import { generate_manifest } from '../generate_manifest/index.js';
 import { get_route_segments } from '../../utils/routing.js';
 import { get_env } from '../../exports/vite/utils.js';
 import generate_fallback from '../postbuild/fallback.js';
 import { write } from '../sync/utils.js';
+import { list_files } from '../utils.js';
 
 const pipe = promisify(pipeline);
+const extensions = ['html', 'js', 'mjs', 'json', 'css', 'svg', 'xml', 'wasm'];
 
 /**
  * Creates the Builder which is passed to adapters for building the application.
@@ -83,13 +84,7 @@ export function create_builder({
 				return;
 			}
 
-			const files = await glob('**/*.{html,js,mjs,json,css,svg,xml,wasm}', {
-				cwd: directory,
-				dot: true,
-				absolute: true,
-				filesOnly: true
-			});
-
+			const files = list_files(directory, (file) => extensions.includes(extname(file)));
 			await Promise.all(
 				files.map((file) => Promise.all([compress_file(file, 'gz'), compress_file(file, 'br')]))
 			);

package/src/core/sync/create_manifest_data/index.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import mime from 'mime';
-import { runtime_directory } from '../../utils.js';
+import { list_files, runtime_directory } from '../../utils.js';
 import { posixify } from '../../../utils/filesystem.js';
 import { parse_route_id } from '../../../utils/routing.js';
 import { sort_routes } from './sort.js';
@@ -468,28 +468,6 @@ function analyze(project_relative, file, component_extensions, module_extensions
 	throw new Error(`Files and directories prefixed with + are reserved (saw ${project_relative})`);
 }
 
-/** @param {string} dir */
-function list_files(dir) {
-	/** @type {string[]} */
-	const files = [];
-
-	/** @param {string} current */
-	function walk(current) {
-		for (const file of fs.readdirSync(path.resolve(dir, current))) {
-			const child = path.posix.join(current, file);
-			if (fs.statSync(path.resolve(dir, child)).isDirectory()) {
-				walk(child);
-			} else {
-				files.push(child);
-			}
-		}
-	}
-
-	if (fs.existsSync(dir)) walk('');
-
-	return files;
-}
-
 /**
  * @param {string} needle
  * @param {string} haystack

package/src/core/utils.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import colors from 'kleur';
@@ -56,3 +57,30 @@ export function get_mime_lookup(manifest_data) {
 
 	return mime;
 }
+
+/**
+ * @param {string} dir
+ * @param {(file: string) => boolean} [filter]
+ */
+export function list_files(dir, filter) {
+	/** @type {string[]} */
+	const files = [];
+
+	/** @param {string} current */
+	function walk(current) {
+		for (const file of fs.readdirSync(path.resolve(dir, current))) {
+			const child = path.posix.join(current, file);
+			if (fs.statSync(path.resolve(dir, child)).isDirectory()) {
+				walk(child);
+			} else {
+				if (!filter || filter(child)) {
+					files.push(child);
+				}
+			}
+		}
+	}
+
+	if (fs.existsSync(dir)) walk('');
+
+	return files;
+}

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

@@ -203,6 +203,12 @@ export function create_universal_fetch(event, state, fetched, csr, resolve_opts)
 	 */
 	return async (input, init) => {
 		const cloned_body = input instanceof Request && input.body ? input.clone().body : null;
+
+		const cloned_headers =
+			input instanceof Request && [...input.headers].length
+				? new Headers(input.headers)
+				: init?.headers;
+
 		let response = await event.fetch(input, init);
 
 		const url = new URL(input instanceof Request ? input.url : input, event.url);
@@ -260,7 +266,7 @@ export function create_universal_fetch(event, state, fetched, csr, resolve_opts)
 									? await stream_to_string(cloned_body)
 									: init?.body
 							),
-							request_headers: init?.headers,
+							request_headers: cloned_headers,
 							response_body: body,
 							response
 						});

package/src/types/internal.d.ts

@@ -1,4 +1,4 @@
-import { SvelteComponent } from 'svelte/internal';
+import { SvelteComponent } from 'svelte';
 import {
 	Config,
 	ServerLoad,

package/src/utils/routing.js

@@ -141,18 +141,17 @@ export function exec(match, params, matchers) {
 
 	for (let i = 0; i < params.length; i += 1) {
 		const param = params[i];
-		const value = values[i - buffered];
+		let value = values[i - buffered];
 
 		// in the `[[a=b]]/.../[...rest]` case, if one or more optional parameters
 		// weren't matched, roll the skipped values into the rest
 		if (param.chained && param.rest && buffered) {
-			result[param.name] = values
+			value = values
 				.slice(i - buffered, i + 1)
 				.filter((s) => s)
 				.join('/');
 
 			buffered = 0;
-			continue;
 		}
 
 		// if `value` is undefined, it means this is an optional or rest parameter

package/types/index.d.ts

@@ -1468,7 +1468,7 @@ declare module '@sveltejs/kit' {
 		status: number;
 		data: T | undefined;
 	}
-	import { SvelteComponent } from 'svelte/internal';
+	import { SvelteComponent } from 'svelte';
 
 	interface ServerModule {
 		Server: typeof InternalServer;