@sveltejs/kit 1.0.0-next.277 → 1.0.0-next.280

package/dist/chunks/index3.js

@@ -16,8 +16,8 @@ import 'os';
  * @param {{
  *   cwd: string;
  *   assets_base: string;
- *   config: import('types/config').ValidatedConfig
- *   manifest_data: import('types/internal').ManifestData
+ *   config: import('types').ValidatedConfig
+ *   manifest_data: import('types').ManifestData
  *   output_dir: string;
  *   service_worker_entry_file: string | null;
  * }} options
@@ -135,8 +135,8 @@ function find_deps(file, manifest, js, css) {
  * @param {{
  *   cwd: string;
  *   assets_base: string;
- *   config: import('types/config').ValidatedConfig
- *   manifest_data: import('types/internal').ManifestData
+ *   config: import('types').ValidatedConfig
+ *   manifest_data: import('types').ManifestData
  *   output_dir: string;
  *   client_entry_file: string;
  *   service_worker_entry_file: string | null;
@@ -256,13 +256,13 @@ async function build_client({
 /**
  * @param {{
  *   hooks: string;
- *   config: import('types/config').ValidatedConfig;
+ *   config: import('types').ValidatedConfig;
  *   has_service_worker: boolean;
  *   template: string;
  * }} opts
  * @returns
  */
-const app_template = ({ config, hooks, has_service_worker, template }) => `
+const server_template = ({ config, hooks, has_service_worker, template }) => `
 import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
@@ -299,7 +299,7 @@ export function override(settings) {
 	read = settings.read;
 }
 
-export class App {
+export class Server {
 	constructor(manifest) {
 		const hooks = get_hooks(user_hooks);
 
@@ -339,7 +339,7 @@ export class App {
 		};
 	}
 
-	render(request, options = {}) {
+	respond(request, options = {}) {
 		if (!(request instanceof Request)) {
 			throw new Error('The first argument to app.render must be a Request object. See https://github.com/sveltejs/kit/pull/3384 for details');
 		}
@@ -353,8 +353,8 @@ export class App {
  * @param {{
  *   cwd: string;
  *   assets_base: string;
- *   config: import('types/config').ValidatedConfig
- *   manifest_data: import('types/internal').ManifestData
+ *   config: import('types').ValidatedConfig
+ *   manifest_data: import('types').ManifestData
  *   build_dir: string;
  *   output_dir: string;
  *   service_worker_entry_file: string | null;
@@ -383,7 +383,7 @@ async function build_server(
 
 	/** @type {Record<string, string>} */
 	const input = {
-		app: `${build_dir}/app.js`
+		index: `${build_dir}/index.js`
 	};
 
 	// add entry points for every endpoint...
@@ -416,8 +416,8 @@ async function build_server(
 	};
 
 	fs__default.writeFileSync(
-		input.app,
-		app_template({
+		input.index,
+		server_template({
 			config,
 			hooks: app_relative(hooks_file),
 			has_service_worker: service_worker_register && !!service_worker_entry_file,
@@ -551,7 +551,7 @@ const method_names = {
  *
  * @param {string} cwd
  * @param {import('rollup').OutputChunk[]} output
- * @param {import('types/internal').ManifestData} manifest_data
+ * @param {import('types').ManifestData} manifest_data
  */
 function get_methods(cwd, output, manifest_data) {
 	/** @type {Record<string, string[]>} */
@@ -562,14 +562,14 @@ function get_methods(cwd, output, manifest_data) {
 		lookup[id] = chunk.exports;
 	});
 
-	/** @type {Record<string, import('types/internal').HttpMethod[]>} */
+	/** @type {Record<string, import('types').HttpMethod[]>} */
 	const methods = {};
 	manifest_data.routes.forEach((route) => {
 		const file = route.type === 'endpoint' ? route.file : route.shadow;
 
 		if (file && lookup[file]) {
 			methods[file] = lookup[file]
-				.map((x) => /** @type {import('types/internal').HttpMethod} */ (method_names[x]))
+				.map((x) => /** @type {import('types').HttpMethod} */ (method_names[x]))
 				.filter(Boolean);
 		}
 	});
@@ -578,8 +578,8 @@ function get_methods(cwd, output, manifest_data) {
 }
 
 /**
- * @param {import('types/config').ValidatedConfig} config
- * @returns {Promise<import('types/internal').BuildData>}
+ * @param {import('types').ValidatedConfig} config
+ * @returns {Promise<import('types').BuildData>}
  */
 async function build(config) {
 	const cwd = process.cwd(); // TODO is this necessary?

package/dist/chunks/index4.js

@@ -2,9 +2,9 @@ import { s } from './misc.js';
 import { g as get_mime_lookup } from '../cli.js';
 
 /**
- * @param {import('../../../types/internal').BuildData} build_data;
+ * @param {import('types').BuildData} build_data;
  * @param {string} relative_path;
- * @param {import('../../../types/internal').RouteData[]} routes;
+ * @param {import('types').RouteData[]} routes;
  * @param {'esm' | 'cjs'} format
  */
 function generate_manifest(

package/dist/chunks/index5.js

@@ -160,8 +160,6 @@ const TAG_OPEN = /[a-zA-Z]/;
 const TAG_CHAR = /[a-zA-Z0-9]/;
 const ATTRIBUTE_NAME = /[^\t\n\f />"'=]/;
 
-const EXTERNAL = /\bexternal\b/;
-
 const WHITESPACE = /[\s\n\r]/;
 
 /** @param {string} html */
@@ -240,7 +238,6 @@ function crawl(html) {
 					}
 				}
 
-				let rel = '';
 				let href = '';
 
 				while (i < html.length) {
@@ -301,9 +298,7 @@ function crawl(html) {
 								i -= 1;
 							}
 
-							if (name === 'rel') {
-								rel = value;
-							} else if (name === 'href') {
+							if (name === 'href') {
 								href = value;
 							} else if (name === 'src') {
 								hrefs.push(value);
@@ -335,7 +330,7 @@ function crawl(html) {
 					i += 1;
 				}
 
-				if (href && !EXTERNAL.test(rel)) {
+				if (href) {
 					hrefs.push(href);
 				}
 			}
@@ -363,61 +358,56 @@ new RegExp(
 );
 
 /**
- * @param str {string} string to escape
- * @param dict {Record<string, string>} dictionary of character replacements
- * @param unicode_encoder {function(number): string} encoder to use for high unicode characters
- * @returns {string}
+ * When inside a double-quoted attribute value, only `&` and `"` hold special meaning.
+ * @see https://html.spec.whatwg.org/multipage/parsing.html#attribute-value-(double-quoted)-state
+ * @type {Record<string, string>}
  */
-function escape(str, dict, unicode_encoder) {
-	let result = '';
-
-	for (let i = 0; i < str.length; i += 1) {
-		const char = str.charAt(i);
-		const code = char.charCodeAt(0);
-
-		if (char in dict) {
-			result += dict[char];
-		} else if (code >= 0xd800 && code <= 0xdfff) {
-			const next = str.charCodeAt(i + 1);
-
-			// If this is the beginning of a [high, low] surrogate pair,
-			// add the next two characters, otherwise escape
-			if (code <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) {
-				result += char + str[++i];
-			} else {
-				result += unicode_encoder(code);
-			}
-		} else {
-			result += char;
-		}
-	}
-
-	return result;
-}
-
-/** @type {Record<string, string>} */
 const escape_html_attr_dict = {
-	'<': '&lt;',
-	'>': '&gt;',
+	'&': '&amp;',
 	'"': '&quot;'
 };
 
+const escape_html_attr_regex = new RegExp(
+	// special characters
+	`[${Object.keys(escape_html_attr_dict).join('')}]|` +
+		// high surrogate without paired low surrogate
+		'[\\ud800-\\udbff](?![\\udc00-\\udfff])|' +
+		// a valid surrogate pair, the only match with 2 code units
+		// we match it so that we can match unpaired low surrogates in the same pass
+		// TODO: use lookbehind assertions once they are widely supported: (?<![\ud800-udbff])[\udc00-\udfff]
+		'[\\ud800-\\udbff][\\udc00-\\udfff]|' +
+		// unpaired low surrogate (see previous match)
+		'[\\udc00-\\udfff]',
+	'g'
+);
+
 /**
- * use for escaping string values to be used html attributes on the page
- * e.g.
- * <script data-url="here">
+ * Formats a string to be used as an attribute's value in raw HTML.
+ *
+ * It escapes unpaired surrogates (which are allowed in js strings but invalid in HTML), escapes
+ * characters that are special in attributes, and surrounds the whole string in double-quotes.
  *
  * @param {string} str
- * @returns string escaped string
+ * @returns {string} Escaped string surrounded by double-quotes.
+ * @example const html = `<tag data-value=${escape_html_attr('value')}>...</tag>`;
  */
 function escape_html_attr(str) {
-	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
+	const escaped_str = str.replace(escape_html_attr_regex, (match) => {
+		if (match.length === 2) {
+			// valid surrogate pair
+			return match;
+		}
+
+		return escape_html_attr_dict[match] ?? `&#${match.charCodeAt(0)};`;
+	});
+
+	return `"${escaped_str}"`;
 }
 
 /**
- * @typedef {import('types/config').PrerenderErrorHandler} PrerenderErrorHandler
- * @typedef {import('types/config').PrerenderOnErrorValue} OnError
- * @typedef {import('types/internal').Logger} Logger
+ * @typedef {import('types').PrerenderErrorHandler} PrerenderErrorHandler
+ * @typedef {import('types').PrerenderOnErrorValue} OnError
+ * @typedef {import('types').Logger} Logger
  */
 
 /** @type {(details: Parameters<PrerenderErrorHandler>[0] ) => string} */
@@ -449,14 +439,14 @@ const REDIRECT = 3;
  *   cwd: string;
  *   out: string;
  *   log: Logger;
- *   config: import('types/config').ValidatedConfig;
- *   build_data: import('types/internal').BuildData;
+ *   config: import('types').ValidatedConfig;
+ *   build_data: import('types').BuildData;
  *   fallback?: string;
  *   all: boolean; // disregard `export const prerender = true`
  * }} opts
  */
 async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
-	/** @type {import('types/config').Prerendered} */
+	/** @type {import('types').Prerendered} */
 	const prerendered = {
 		pages: new Map(),
 		assets: new Map(),
@@ -472,8 +462,8 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 	const server_root = resolve$1(cwd, `${SVELTE_KIT}/output`);
 
-	/** @type {import('types/internal').AppModule} */
-	const { App, override } = await import(pathToFileURL(`${server_root}/server/app.js`).href);
+	/** @type {import('types').ServerModule} */
+	const { Server, override } = await import(pathToFileURL(`${server_root}/server/index.js`).href);
 	const { manifest } = await import(pathToFileURL(`${server_root}/server/manifest.js`).href);
 
 	override({
@@ -482,7 +472,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 		read: (file) => readFileSync(join(config.kit.files.assets, file))
 	});
 
-	const app = new App(manifest);
+	const server = new Server(manifest);
 
 	const error = normalise_error_handler(log, config.kit.prerender.onError);
 
@@ -547,10 +537,10 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 			return;
 		}
 
-		/** @type {Map<string, import('types/internal').PrerenderDependency>} */
+		/** @type {Map<string, import('types').PrerenderDependency>} */
 		const dependencies = new Map();
 
-		const response = await app.render(new Request(`http://sveltekit-prerender${encoded}`), {
+		const response = await server.respond(new Request(`http://sveltekit-prerender${encoded}`), {
 			prerender: {
 				all,
 				dependencies
@@ -685,7 +675,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 	}
 
 	if (fallback) {
-		const rendered = await app.render(new Request('http://sveltekit-prerender/[fallback]'), {
+		const rendered = await server.respond(new Request('http://sveltekit-prerender/[fallback]'), {
 			prerender: {
 				fallback,
 				all: false,
@@ -704,11 +694,11 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 /**
  * @param {{
  *   cwd: string;
- *   config: import('types/config').ValidatedConfig;
- *   build_data: import('types/internal').BuildData;
- *   log: import('types/internal').Logger;
+ *   config: import('types').ValidatedConfig;
+ *   build_data: import('types').BuildData;
+ *   log: import('types').Logger;
  * }} opts
- * @returns {import('types/config').Builder}
+ * @returns {import('types').Builder}
  */
 function create_builder({ cwd, config, build_data, log }) {
 	/** @type {Set<string>} */
@@ -716,7 +706,7 @@ function create_builder({ cwd, config, build_data, log }) {
 
 	let generated_manifest = false;
 
-	/** @param {import('types/internal').RouteData} route */
+	/** @param {import('types').RouteData} route */
 	function not_prerendered(route) {
 		if (!prerendered_paths) return true;
 
@@ -741,7 +731,7 @@ function create_builder({ cwd, config, build_data, log }) {
 
 			const { routes } = build_data.manifest_data;
 
-			/** @type {import('types/config').RouteDefinition[]} */
+			/** @type {import('types').RouteDefinition[]} */
 			const facades = routes.map((route) => ({
 				type: route.type,
 				segments: route.segments,
@@ -872,8 +862,8 @@ function create_builder({ cwd, config, build_data, log }) {
 }
 
 /**
- * @param {import('types/config').ValidatedConfig} config
- * @param {import('types/internal').BuildData} build_data
+ * @param {import('types').ValidatedConfig} config
+ * @param {import('types').BuildData} build_data
  * @param {{ cwd?: string, verbose: boolean }} opts
  */
 async function adapt(config, build_data, { cwd = process.cwd(), verbose }) {

package/dist/chunks/index6.js

@@ -31,7 +31,7 @@ const mutable = (dir) =>
  * @param {{
  *   port: number;
  *   host?: string;
- *   config: import('types/config').ValidatedConfig;
+ *   config: import('types').ValidatedConfig;
  *   https?: boolean;
  *   cwd?: string;
  * }} opts
@@ -45,11 +45,11 @@ async function preview({
 }) {
 	__fetch_polyfill();
 
-	const app_file = resolve(cwd, `${SVELTE_KIT}/output/server/app.js`);
+	const index_file = resolve(cwd, `${SVELTE_KIT}/output/server/index.js`);
 	const manifest_file = resolve(cwd, `${SVELTE_KIT}/output/server/manifest.js`);
 
-	/** @type {import('types/internal').AppModule} */
-	const { App, override } = await import(pathToFileURL(app_file).href);
+	/** @type {import('types').ServerModule} */
+	const { Server, override } = await import(pathToFileURL(index_file).href);
 
 	const { manifest } = await import(pathToFileURL(manifest_file).href);
 
@@ -78,12 +78,12 @@ async function preview({
 		read: (file) => fs__default.readFileSync(join(config.kit.files.assets, file))
 	});
 
-	const app = new App(manifest);
+	const server = new Server(manifest);
 
 	/** @type {import('vite').UserConfig} */
 	const vite_config = (config.kit.vite && (await config.kit.vite())) || {};
 
-	const server = await get_server(use_https, vite_config, (req, res) => {
+	const http_server = await get_server(use_https, vite_config, (req, res) => {
 		if (req.url == null) {
 			throw new Error('Invalid request url');
 		}
@@ -105,7 +105,7 @@ async function preview({
 					return res.end(err.reason || 'Invalid request body');
 				}
 
-				setResponse(res, await app.render(request));
+				setResponse(res, await server.respond(request));
 			} else {
 				res.statusCode = 404;
 				res.end('Not found');
@@ -132,9 +132,9 @@ async function preview({
 		}
 	});
 
-	await server.listen(port, host || '0.0.0.0');
+	await http_server.listen(port, host || '0.0.0.0');
 
-	return Promise.resolve(server);
+	return Promise.resolve(http_server);
 }
 
 /**

package/dist/chunks/index7.js

@@ -15250,7 +15250,7 @@ async function preprocess(source, preprocessor, options) {
 const essential_files = ['README', 'LICENSE', 'CHANGELOG', '.gitignore', '.npmignore'];
 
 /**
- * @param {import('types/config').ValidatedConfig} config
+ * @param {import('types').ValidatedConfig} config
  * @param {string} cwd
  */
 async function make_package(config, cwd = process.cwd()) {
@@ -15429,7 +15429,7 @@ async function make_package(config, cwd = process.cwd()) {
  *
  * @param {string} file Relative to the lib root
  * @param {string} content
- * @param {import('types/config').ValidatedConfig} config
+ * @param {import('types').ValidatedConfig} config
  * @returns {string}
  */
 function resolve_$lib_alias(file, content, config) {
@@ -15548,7 +15548,7 @@ function write(file, contents) {
 }
 
 /**
- * @param {import('types/config').ValidatedConfig} config
+ * @param {import('types').ValidatedConfig} config
  */
 async function emit_dts(config) {
 	const require = createRequire(import.meta.url);

package/dist/cli.js

@@ -362,7 +362,7 @@ function noop() {}
 
 /** @param {{ verbose: boolean }} opts */
 function logger({ verbose }) {
-	/** @type {import('types/internal').Logger} */
+	/** @type {import('types').Logger} */
 	const log = (msg) => console.log(msg.replace(/^/gm, '  '));
 
 	/** @param {string} msg */
@@ -881,7 +881,7 @@ function error(fn) {
 
 /**
  * @param {string} cwd
- * @param {import('types/config').ValidatedConfig} config
+ * @param {import('types').ValidatedConfig} config
  */
 function load_template(cwd, config) {
 	const { template } = config.kit.files;
@@ -926,8 +926,8 @@ async function load_config({ cwd = process.cwd() } = {}) {
 }
 
 /**
- * @param {import('types/config').Config} config
- * @returns {import('types/config').ValidatedConfig}
+ * @param {import('types').Config} config
+ * @returns {import('types').ValidatedConfig}
  */
 function validate_config(config) {
 	if (typeof config !== 'object') {
@@ -998,7 +998,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.277');
+const prog = sade('svelte-kit').version('1.0.0-next.280');
 
 prog
 	.command('dev')
@@ -1156,7 +1156,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, loose, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.277'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.280'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/hooks.js

@@ -1,6 +1,6 @@
 /**
- * @param {...import('types/hooks').Handle} handlers
- * @returns {import('types/hooks').Handle}
+ * @param {...import('types').Handle} handlers
+ * @returns {import('types').Handle}
  */
 function sequence(...handlers) {
 	const length = handlers.length;
@@ -11,8 +11,8 @@ function sequence(...handlers) {
 
 		/**
 		 * @param {number} i
-		 * @param {import('types/hooks').RequestEvent} event
-		 * @returns {import('types/helper').MaybePromise<Response>}
+		 * @param {import('types').RequestEvent} event
+		 * @returns {import('types').MaybePromise<Response>}
 		 */
 		function apply_handle(i, event) {
 			const handle = handlers[i];

package/dist/node.js

@@ -71,7 +71,7 @@ async function getRequest(base, req) {
 
 /** @type {import('@sveltejs/kit/node').SetResponse} */
 async function setResponse(res, response) {
-	/** @type {import('../types/helper').ResponseHeaders} */
+	/** @type {import('types').ResponseHeaders} */
 	const headers = Object.fromEntries(response.headers);
 
 	if (response.headers.has('set-cookie')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.277",
+  "version": "1.0.0-next.280",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -76,7 +76,7 @@
     "node": ">=14.13"
   },
   "scripts": {
-    "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components",
+    "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types",
     "dev": "rollup -cw",
     "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format",
     "check": "tsc && svelte-check --ignore test/prerendering,src/packaging/test",
@@ -92,6 +92,7 @@
     "test:integration:amp": "cd test/apps/amp && pnpm test",
     "test:integration:basics": "cd test/apps/basics && pnpm test",
     "test:integration:options": "cd test/apps/options && pnpm test",
-    "test:integration:options-2": "cd test/apps/options-2 && pnpm test"
+    "test:integration:options-2": "cd test/apps/options-2 && pnpm test",
+    "types": "node scripts/extract-types.js"
   }
 }