@sveltejs/kit 2.63.0 → 3.0.0-next.0

package/src/utils/css.js

@@ -1,19 +1,10 @@
 import MagicString from 'magic-string';
-import * as svelte from 'svelte/compiler';
+import { parseCss } from 'svelte/compiler';
 
-/** @typedef {ReturnType<typeof import('svelte/compiler').parseCss>['children']} StyleSheetChildren */
+/** @typedef {ReturnType<typeof parseCss>['children']} StyleSheetChildren */
 
 /** @typedef {{ property: string; value: string; start: number; end: number; type: 'Declaration' }} Declaration */
 
-const parse = svelte.parseCss
-	? svelte.parseCss
-	: /** @param {string} css */
-		(css) => {
-			return /** @type {{ css: { children: StyleSheetChildren } }} */ (
-				svelte.parse(`<style>${css}</style>`)
-			).css;
-		};
-
 const SKIP_PARSING_REGEX = /url\(/i;
 
 /** Capture a single url(...) so we can process them one at a time */
@@ -31,8 +22,6 @@ const HASH_OR_QUERY_REGEX = /[#?]/;
  */
 const VITE_ASSET_PREFIX = './';
 
-const AST_OFFSET = '<style>'.length;
-
 /**
  * We need to fix the asset URLs in the CSS before we inline them into a document
  * because they are now relative to the document instead of the CSS file.
@@ -70,7 +59,7 @@ export function fix_css_urls({
 
 	const s = new MagicString(css);
 
-	const parsed = parse(css);
+	const parsed = parseCss(css);
 
 	for (const child of parsed.children) {
 		find_declarations(child, (declaration) => {
@@ -128,11 +117,6 @@ export function fix_css_urls({
 
 			if (declaration.value === new_value) return;
 
-			if (!svelte.parseCss) {
-				declaration.start = declaration.start - AST_OFFSET;
-				declaration.end = declaration.end - AST_OFFSET;
-			}
-
 			s.update(declaration.start, declaration.end, `${declaration.property}: ${new_value}`);
 		});
 	}

package/src/utils/filesystem.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { posixify } from './os.js';
 
 /** @param {string} dir */
 export function mkdirp(dir) {
@@ -110,11 +111,6 @@ export function walk(cwd, dirs = false) {
 	return (walk_dir(''), all_files);
 }
 
-/** @param {string} str */
-export function posixify(str) {
-	return str.replace(/\\/g, '/');
-}
-
 /**
  * Like `path.join`, but posixified and with a leading `./` if necessary
  * @param {string[]} str
@@ -138,31 +134,6 @@ export function relative_path(from, to) {
 	return join_relative(path.relative(from, to));
 }
 
-/**
- * Prepend given path with `/@fs` prefix
- * @param {string} str
- */
-export function to_fs(str) {
-	str = posixify(str);
-	return `/@fs${
-		// Windows/Linux separation - Windows starts with a drive letter, we need a / in front there
-		str.startsWith('/') ? '' : '/'
-	}${str}`;
-}
-
-/**
- * Removes `/@fs` prefix from given path and posixifies it
- * @param {string} str
- */
-export function from_fs(str) {
-	str = posixify(str);
-	if (!str.startsWith('/@fs')) return str;
-
-	str = str.slice(4);
-	// Windows/Linux separation - Windows starts with a drive letter, we need to strip the additional / here
-	return str[2] === ':' && /[A-Z]/.test(str[1]) ? str.slice(1) : str;
-}
-
 /**
  * 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

package/src/utils/http.js

@@ -1,4 +1,3 @@
-import * as set_cookie_parser from 'set-cookie-parser';
 import { BINARY_FORM_CONTENT_TYPE } from '../runtime/form-utils.js';
 
 /**
@@ -57,26 +56,6 @@ export function negotiate(accept, types) {
 	return accepted;
 }
 
-/**
- * Reads all `Set-Cookie` headers as separate values. `Headers.get('set-cookie')`
- * collapses them into a single comma-joined string that browsers cannot parse, so
- * we use `Headers.getSetCookie()` where available and fall back to splitting the
- * joined string otherwise.
- *
- * TODO 3.0 `getSetCookie` is available in Node 19.7+; once we drop support for
- * older versions we can use it directly and remove the `splitCookiesString` fallback
- * @param {Headers} headers
- * @returns {string[]}
- */
-export function get_set_cookies(headers) {
-	if (typeof headers.getSetCookie === 'function') {
-		return headers.getSetCookie();
-	}
-
-	const set_cookie = headers.get('set-cookie');
-	return set_cookie ? set_cookie_parser.splitCookiesString(set_cookie) : [];
-}
-
 /**
  * Returns `true` if the request contains a `content-type` header with the given type
  * @param {Request} request

package/src/utils/import.js

@@ -1,16 +1,16 @@
-import process from 'node:process';
 import fs from 'node:fs';
 import path from 'node:path';
 
 /**
- * Resolves a peer dependency relative to the current CWD. Duplicated with `packages/adapter-auto`
+ * Resolves a peer dependency relative to the current working directory. Duplicated with `packages/adapter-auto`
  * @param {string} dependency
+ * @param {string} root
  */
-function resolve_peer(dependency) {
+function resolve_peer(dependency, root) {
 	let [name, ...parts] = dependency.split('/');
 	if (name[0] === '@') name += `/${parts.shift()}`;
 
-	let dir = process.cwd();
+	let dir = root;
 
 	while (!fs.existsSync(`${dir}/node_modules/${name}/package.json`)) {
 		if (dir === (dir = path.dirname(dir))) {
@@ -42,10 +42,11 @@ function resolve_peer(dependency) {
  * Resolve a dependency relative to the current working directory,
  * rather than relative to this package (but falls back to trying that, if necessary)
  * @param {string} dependency
+ * @param {string} root
  */
-export async function import_peer(dependency) {
+export async function import_peer(dependency, root) {
 	try {
-		return await import(/* @vite-ignore */ resolve_peer(dependency));
+		return await import(/* @vite-ignore */ resolve_peer(dependency, root));
 	} catch {
 		return await import(/* @vite-ignore */ dependency);
 	}

package/src/utils/os.js

@@ -0,0 +1,7 @@
+// this file needs to remain node-agnostic because it could be imported into an
+// environment without access to `node:*`
+
+/** @param {string} str */
+export function posixify(str) {
+	return str.replace(/\\/g, '/');
+}

package/src/utils/path.js

@@ -0,0 +1,23 @@
+// This file contains Node-agnostic path utilities so that it can be used in
+// environments that do not have access to `node:path` (e.g. Cloudflare Workers).
+
+/**
+ * @param {string} from
+ * @param {string} to
+ * @returns {string}
+ */
+export function relative(from, to) {
+	const from_parts = from.split('/').filter(Boolean);
+	const to_parts = to.split('/').filter(Boolean);
+	let i = 0;
+	while (i < from_parts.length && i < to_parts.length && from_parts[i] === to_parts[i]) i++;
+	return [...Array(from_parts.length - i).fill('..'), ...to_parts.slice(i)].join('/') || '.';
+}
+
+/**
+ * @param  {...string} parts
+ * @returns {string}
+ */
+export function join(...parts) {
+	return parts.join('/');
+}

package/src/utils/shared-iterator.js

@@ -205,6 +205,9 @@ export class SharedIterator {
 			},
 			[Symbol.asyncIterator]() {
 				return iterator;
+			},
+			async [Symbol.asyncDispose]() {
+				// TODO: investigate if this needs to be implemented
 			}
 		};
 

package/src/utils/streaming.js

@@ -1,5 +1,3 @@
-import { with_resolvers } from './promise.js';
-
 /**
  * Create an async iterator and a function to push values into it
  * @template T
@@ -12,7 +10,7 @@ export function create_async_iterator() {
 	let resolved = -1;
 	let returned = -1;
 
-	/** @type {import('./promise.js').PromiseWithResolvers<T>[]} */
+	/** @type {PromiseWithResolvers<T>[]} */
 	const deferred = [];
 
 	return {
@@ -32,7 +30,7 @@ export function create_async_iterator() {
 			};
 		},
 		add: (promise) => {
-			deferred.push(with_resolvers());
+			deferred.push(Promise.withResolvers());
 			void promise.then((value) => {
 				deferred[++resolved].resolve(value);
 			});

package/src/utils/url.js

@@ -6,7 +6,7 @@ import { BROWSER, DEV } from 'esm-env';
  */
 export const SCHEME = /^[a-z][a-z\d+\-.]+:/i;
 
-const internal = new URL('sveltekit-internal://');
+const internal = new URL('a://');
 
 /**
  * @param {string} base

package/src/utils/vite.js

@@ -0,0 +1,28 @@
+// this file needs to be runtime agnostic and avoid importing from `node:*` since
+// it may not be available in edge environments
+import { posixify } from './os.js';
+
+/**
+ * Prepend given path with `/@fs` prefix
+ * @param {string} str
+ */
+export function to_fs(str) {
+	str = posixify(str);
+	return `/@fs${
+		// Windows/Linux separation - Windows starts with a drive letter, we need a / in front there
+		str.startsWith('/') ? '' : '/'
+	}${str}`;
+}
+
+/**
+ * Removes `/@fs` prefix from given path and posixifies it
+ * @param {string} str
+ */
+export function from_fs(str) {
+	str = posixify(str);
+	if (!str.startsWith('/@fs')) return str;
+
+	str = str.slice(4);
+	// Windows/Linux separation - Windows starts with a drive letter, we need to strip the additional / here
+	return str[2] === ':' && /[A-Z]/.test(str[1]) ? str.slice(1) : str;
+}

package/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '2.63.0';
+export const VERSION = '3.0.0-next.0';