@sveltejs/kit 1.0.0-next.306 → 1.0.0-next.309

package/assets/client/start.js

@@ -269,7 +269,7 @@ function parse_route_id(id) {
 			? /^\/$/
 			: new RegExp(
 					`^${decodeURIComponent(id)
-						.split(/(?:@(?:~|[a-zA-Z0-9_-]*))?(?:\/|$)/)
+						.split(/(?:@[a-zA-Z0-9_-]+)?(?:\/|$)/)
 						.map((segment, i, segments) => {
 							// special case — /[...rest]/ could contain zero segments
 							const match = /^\[\.\.\.(\w+)(?:=(\w+))?\]$/.exec(segment);

package/assets/server/index.js

@@ -1161,7 +1161,14 @@ async function render_response({
 			stores: {
 				page: writable(null),
 				navigating: writable(null),
-				session,
+				/** @type {import('svelte/store').Writable<App.Session>} */
+				session: {
+					...session,
+					subscribe: (fn) => {
+						is_private = true;
+						return session.subscribe(fn);
+					}
+				},
 				updated
 			},
 			/** @type {import('types').Page} */
@@ -1199,17 +1206,7 @@ async function render_response({
 			props[`props_${i}`] = await branch[i].loaded.props;
 		}
 
-		let session_tracking_active = false;
-		const unsubscribe = session.subscribe(() => {
-			if (session_tracking_active) is_private = true;
-		});
-		session_tracking_active = true;
-
-		try {
-			rendered = options.root.render(props);
-		} finally {
-			unsubscribe();
-		}
+		rendered = options.root.render(props);
 	} else {
 		rendered = { head: '', html: '', css: { code: '', map: null } };
 	}
@@ -2081,38 +2078,46 @@ async function respond_with_error({
 	resolve_opts
 }) {
 	try {
-		const default_layout = await options.manifest._.nodes[0](); // 0 is always the root layout
-		const default_error = await options.manifest._.nodes[1](); // 1 is always the root error
+		const branch = [];
+		let stuff = {};
+
+		if (resolve_opts.ssr) {
+			const default_layout = await options.manifest._.nodes[0](); // 0 is always the root layout
+			const default_error = await options.manifest._.nodes[1](); // 1 is always the root error
+
+			const layout_loaded = /** @type {Loaded} */ (
+				await load_node({
+					event,
+					options,
+					state,
+					route: null,
+					node: default_layout,
+					$session,
+					stuff: {},
+					is_error: false,
+					is_leaf: false
+				})
+			);
 
-		const layout_loaded = /** @type {Loaded} */ (
-			await load_node({
-				event,
-				options,
-				state,
-				route: null,
-				node: default_layout,
-				$session,
-				stuff: {},
-				is_error: false,
-				is_leaf: false
-			})
-		);
+			const error_loaded = /** @type {Loaded} */ (
+				await load_node({
+					event,
+					options,
+					state,
+					route: null,
+					node: default_error,
+					$session,
+					stuff: layout_loaded ? layout_loaded.stuff : {},
+					is_error: true,
+					is_leaf: false,
+					status,
+					error
+				})
+			);
 
-		const error_loaded = /** @type {Loaded} */ (
-			await load_node({
-				event,
-				options,
-				state,
-				route: null,
-				node: default_error,
-				$session,
-				stuff: layout_loaded ? layout_loaded.stuff : {},
-				is_error: true,
-				is_leaf: false,
-				status,
-				error
-			})
-		);
+			branch.push(layout_loaded, error_loaded);
+			stuff = error_loaded.stuff;
+		}
 
 		return await render_response({
 			options,
@@ -2122,10 +2127,10 @@ async function respond_with_error({
 				hydrate: options.hydrate,
 				router: options.router
 			},
-			stuff: error_loaded.stuff,
+			stuff,
 			status,
 			error,
-			branch: [layout_loaded, error_loaded],
+			branch,
 			event,
 			resolve_opts
 		});

package/dist/chunks/index.js

@@ -433,7 +433,6 @@ async function dev({ cwd, port, host, https, config }) {
 				fs: {
 					allow: [
 						...new Set([
-							config.kit.files.assets,
 							config.kit.files.lib,
 							config.kit.files.routes,
 							config.kit.outDir,

package/dist/chunks/index2.js

@@ -714,7 +714,7 @@ function crawl(html) {
 			if (html[i + 1] === '!') {
 				i += 2;
 
-				if (html.substr(i, DOCTYPE.length).toUpperCase() === DOCTYPE) {
+				if (html.slice(i, i + DOCTYPE.length).toUpperCase() === DOCTYPE) {
 					i += DOCTYPE.length;
 					while (i < html.length) {
 						if (html[i++] === '>') {
@@ -724,10 +724,10 @@ function crawl(html) {
 				}
 
 				// skip cdata
-				if (html.substr(i, CDATA_OPEN.length) === CDATA_OPEN) {
+				if (html.slice(i, i + CDATA_OPEN.length) === CDATA_OPEN) {
 					i += CDATA_OPEN.length;
 					while (i < html.length) {
-						if (html.substr(i, CDATA_CLOSE.length) === CDATA_CLOSE) {
+						if (html.slice(i, i + CDATA_CLOSE.length) === CDATA_CLOSE) {
 							i += CDATA_CLOSE.length;
 							continue main;
 						}
@@ -737,10 +737,10 @@ function crawl(html) {
 				}
 
 				// skip comments
-				if (html.substr(i, COMMENT_OPEN.length) === COMMENT_OPEN) {
+				if (html.slice(i, i + COMMENT_OPEN.length) === COMMENT_OPEN) {
 					i += COMMENT_OPEN.length;
 					while (i < html.length) {
-						if (html.substr(i, COMMENT_CLOSE.length) === COMMENT_CLOSE) {
+						if (html.slice(i, i + COMMENT_CLOSE.length) === COMMENT_CLOSE) {
 							i += COMMENT_CLOSE.length;
 							continue main;
 						}
@@ -768,7 +768,7 @@ function crawl(html) {
 						if (
 							html[i] === '<' &&
 							html[i + 1] === '/' &&
-							html.substr(i + 2, tag.length).toUpperCase() === tag
+							html.slice(i + 2, i + 2 + tag.length).toUpperCase() === tag
 						) {
 							continue main;
 						}

package/dist/chunks/misc.js

@@ -17,7 +17,7 @@ function parse_route_id(id) {
 			? /^\/$/
 			: new RegExp(
 					`^${decodeURIComponent(id)
-						.split(/(?:@(?:~|[a-zA-Z0-9_-]*))?(?:\/|$)/)
+						.split(/(?:@[a-zA-Z0-9_-]+)?(?:\/|$)/)
 						.map((segment, i, segments) => {
 							// special case — /[...rest]/ could contain zero segments
 							const match = /^\[\.\.\.(\w+)(?:=(\w+))?\]$/.exec(segment);

package/dist/chunks/sync.js

@@ -195,7 +195,9 @@ function create_manifest_data({
 		const extension = valid_extensions.find((ext) => file.endsWith(ext));
 		if (!extension) return;
 
-		const id = file.slice(0, -extension.length).replace(/\/?index(\.[a-z]+)?$/, '$1');
+		const id = file
+			.slice(0, -extension.length)
+			.replace(/(?:^|\/)index((?:@[a-zA-Z0-9_-]+)?(?:\.[a-z]+)?)?$/, '$1');
 		const project_relative = `${routes_base}/${file}`;
 
 		const segments = id.split('/');

package/dist/cli.js

@@ -870,7 +870,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.306');
+const prog = sade('svelte-kit').version('1.0.0-next.309');
 
 prog
 	.command('dev')
@@ -981,7 +981,6 @@ prog
 prog
 	.command('package')
 	.describe('Create a package')
-	.option('-d, --dir', 'Destination directory', 'package')
 	.action(async () => {
 		try {
 			const config = await load_config();
@@ -1050,7 +1049,7 @@ async function check_port(port) {
 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.306'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.309'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.306",
+  "version": "1.0.0-next.309",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/index.d.ts

@@ -223,14 +223,14 @@ export interface RequestHandler<
 	Params extends Record<string, string> = Record<string, string>,
 	Output extends ResponseBody = ResponseBody
 > {
-	(event: RequestEvent<Params>): RequestHandlerOutput<Output>;
+	(event: RequestEvent<Params>): MaybePromise<RequestHandlerOutput<Output>>;
 }
 
-export type RequestHandlerOutput<Output extends ResponseBody = ResponseBody> = MaybePromise<{
+export interface RequestHandlerOutput<Output extends ResponseBody = ResponseBody> {
 	status?: number;
 	headers?: Headers | Partial<ResponseHeaders>;
 	body?: Output;
-}>;
+}
 
 export type ResponseBody = JSONValue | Uint8Array | ReadableStream | import('stream').Readable;