@sveltejs/kit 1.0.0-next.347 → 1.0.0-next.348

package/assets/server/index.js

@@ -3093,8 +3093,9 @@ async function respond(request, options, state) {
 	const is_data_request = decoded.endsWith(DATA_SUFFIX);
 
 	if (is_data_request) {
-		decoded = decoded.slice(0, -DATA_SUFFIX.length) || '/';
-		url = new URL(url.origin + url.pathname.slice(0, -DATA_SUFFIX.length) + url.search);
+		const data_suffix_length = DATA_SUFFIX.length - (options.trailing_slash === 'always' ? 1 : 0);
+		decoded = decoded.slice(0, -data_suffix_length) || '/';
+		url = new URL(url.origin + url.pathname.slice(0, -data_suffix_length) + url.search);
 	}
 
 	if (!state.prerendering?.fallback) {
@@ -3113,19 +3114,26 @@ async function respond(request, options, state) {
 		}
 	}
 
-	if (route?.type === 'page') {
-		const normalized = normalize_path(url.pathname, options.trailing_slash);
+	if (route) {
+		if (route.type === 'page') {
+			const normalized = normalize_path(url.pathname, options.trailing_slash);
 
-		if (normalized !== url.pathname && !state.prerendering?.fallback) {
+			if (normalized !== url.pathname && !state.prerendering?.fallback) {
+				return new Response(undefined, {
+					status: 301,
+					headers: {
+						'x-sveltekit-normalize': '1',
+						location:
+							// ensure paths starting with '//' are not treated as protocol-relative
+							(normalized.startsWith('//') ? url.origin + normalized : normalized) +
+							(url.search === '?' ? '' : url.search)
+					}
+				});
+			}
+		} else if (is_data_request) {
+			// requesting /__data.json should fail for a standalone endpoint
 			return new Response(undefined, {
-				status: 301,
-				headers: {
-					'x-sveltekit-normalize': '1',
-					location:
-						// ensure paths starting with '//' are not treated as protocol-relative
-						(normalized.startsWith('//') ? url.origin + normalized : normalized) +
-						(url.search === '?' ? '' : url.search)
-				}
+				status: 404
 			});
 		}
 	}

package/dist/chunks/index.js

@@ -137,7 +137,7 @@ function find_deps(file, manifest, js, css) {
  */
 const get_default_config = function ({ client_out_dir, config, input, output_dir, ssr }) {
 	return {
-		base: assets_base(config),
+		base: assets_base(config.kit),
 		build: {
 			cssCodeSplit: true,
 			manifest: true,
@@ -169,21 +169,21 @@ const get_default_config = function ({ client_out_dir, config, input, output_dir
 		// if it happens to be 'public' instead of 'static'
 		publicDir: false,
 		resolve: {
-			alias: get_aliases(config)
+			alias: get_aliases(config.kit)
 		}
 	};
 };
 
 /**
- * @param {import('types').ValidatedConfig} config
+ * @param {import('types').ValidatedKitConfig} config
  * @returns {string}
  */
 function assets_base(config) {
 	// TODO this is so that Vite's preloading works. Unfortunately, it fails
 	// during `svelte-kit preview`, because we use a local asset path. This
 	// may be fixed in Vite 3: https://github.com/vitejs/vite/issues/2009
-	const { base, assets } = config.kit.paths;
-	return `${assets || base}/${config.kit.appDir}/immutable/`;
+	const { base, assets } = config.paths;
+	return `${assets || base}/${config.appDir}/immutable/`;
 }
 
 /**
@@ -248,7 +248,7 @@ async function build_service_worker(
 
 	/** @type {[any, string[]]} */
 	const [merged_config, conflicts] = deep_merge(await config.kit.vite(), {
-		base: assets_base(config),
+		base: assets_base(config.kit),
 		build: {
 			lib: {
 				entry: service_worker_entry_file,
@@ -511,7 +511,7 @@ async function build_server(options, client) {
 			config,
 			hooks: app_relative(hooks_file),
 			has_service_worker: config.kit.serviceWorker.register && !!service_worker_entry_file,
-			runtime: get_runtime_path(config),
+			runtime: get_runtime_path(config.kit),
 			template: load_template(cwd, config)
 		})
 	);
@@ -1031,7 +1031,7 @@ const REDIRECT = 3;
 
 /**
  * @param {{
- *   config: import('types').ValidatedConfig;
+ *   config: import('types').ValidatedKitConfig;
  *   entries: string[];
  *   files: Set<string>;
  *   log: Logger;
@@ -1046,36 +1046,36 @@ async function prerender({ config, entries, files, log }) {
 		paths: []
 	};
 
-	if (!config.kit.prerender.enabled) {
+	if (!config.prerender.enabled) {
 		return prerendered;
 	}
 
 	installPolyfills();
 
-	const server_root = join(config.kit.outDir, 'output');
+	const server_root = join(config.outDir, 'output');
 
 	/** @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({
-		paths: config.kit.paths,
+		paths: config.paths,
 		prerendering: true,
-		read: (file) => readFileSync(join(config.kit.files.assets, file))
+		read: (file) => readFileSync(join(config.files.assets, file))
 	});
 
 	const server = new Server(manifest);
 
-	const error = normalise_error_handler(log, config.kit.prerender.onError);
+	const error = normalise_error_handler(log, config.prerender.onError);
 
-	const q = queue(config.kit.prerender.concurrency);
+	const q = queue(config.prerender.concurrency);
 
 	/**
 	 * @param {string} path
 	 * @param {boolean} is_html
 	 */
 	function output_filename(path, is_html) {
-		const file = path.slice(config.kit.paths.base.length + 1);
+		const file = path.slice(config.paths.base.length + 1);
 
 		if (file === '') {
 			return 'index.html';
@@ -1100,7 +1100,7 @@ async function prerender({ config, entries, files, log }) {
 		if (seen.has(decoded)) return;
 		seen.add(decoded);
 
-		const file = decoded.slice(config.kit.paths.base.length + 1);
+		const file = decoded.slice(config.paths.base.length + 1);
 		if (files.has(file)) return;
 
 		return q.add(() => visit(decoded, encoded || encodeURI(decoded), referrer));
@@ -1112,7 +1112,7 @@ async function prerender({ config, entries, files, log }) {
 	 * @param {string?} referrer
 	 */
 	async function visit(decoded, encoded, referrer) {
-		if (!decoded.startsWith(config.kit.paths.base)) {
+		if (!decoded.startsWith(config.paths.base)) {
 			error({ status: 404, path: decoded, referrer, referenceType: 'linked' });
 			return;
 		}
@@ -1149,7 +1149,7 @@ async function prerender({ config, entries, files, log }) {
 			);
 		}
 
-		if (config.kit.prerender.crawl && response.headers.get('content-type') === 'text/html') {
+		if (config.prerender.crawl && response.headers.get('content-type') === 'text/html') {
 			for (const href of crawl(text)) {
 				if (href.startsWith('data:') || href.startsWith('#')) continue;
 
@@ -1178,7 +1178,7 @@ async function prerender({ config, entries, files, log }) {
 		const is_html = response_type === REDIRECT || type === 'text/html';
 
 		const file = output_filename(decoded, is_html);
-		const dest = `${config.kit.outDir}/output/prerendered/${category}/${file}`;
+		const dest = `${config.outDir}/output/prerendered/${category}/${file}`;
 
 		if (written.has(file)) return;
 
@@ -1242,14 +1242,14 @@ async function prerender({ config, entries, files, log }) {
 		}
 	}
 
-	if (config.kit.prerender.enabled) {
-		for (const entry of config.kit.prerender.entries) {
+	if (config.prerender.enabled) {
+		for (const entry of config.prerender.entries) {
 			if (entry === '*') {
 				for (const entry of entries) {
-					enqueue(null, config.kit.paths.base + entry); // TODO can we pre-normalize these?
+					enqueue(null, config.paths.base + entry); // TODO can we pre-normalize these?
 				}
 			} else {
-				enqueue(null, config.kit.paths.base + entry);
+				enqueue(null, config.paths.base + entry);
 			}
 		}
 
@@ -1264,7 +1264,7 @@ async function prerender({ config, entries, files, log }) {
 		}
 	});
 
-	const file = `${config.kit.outDir}/output/prerendered/fallback.html`;
+	const file = `${config.outDir}/output/prerendered/fallback.html`;
 	mkdirp(dirname(file));
 	writeFileSync(file, await rendered.text());
 
@@ -1299,7 +1299,7 @@ async function build(config, { log }) {
 		build_dir,
 		manifest_data,
 		output_dir,
-		client_entry_file: path__default.relative(cwd, `${get_runtime_path(config)}/client/start.js`),
+		client_entry_file: path__default.relative(cwd, `${get_runtime_path(config.kit)}/client/start.js`),
 		service_worker_entry_file: resolve_entry(config.kit.files.serviceWorker)
 	};
 
@@ -1338,7 +1338,7 @@ async function build(config, { log }) {
 	});
 
 	const prerendered = await prerender({
-		config,
+		config: config.kit,
 		entries: options.manifest_data.routes
 			.map((route) => (route.type === 'page' ? route.path : ''))
 			.filter(Boolean),

package/dist/chunks/index5.js

@@ -15556,7 +15556,7 @@ async function build(config, cwd = process.cwd()) {
 	mkdirp(dir);
 
 	// Make sure generated tsconfig is up-to-date
-	write_tsconfig(config, cwd);
+	write_tsconfig(config.kit, cwd);
 
 	const files = scan(config);
 

package/dist/chunks/plugin.js

@@ -42,6 +42,7 @@ const cwd = process.cwd();
  * @return {import('vite').Plugin}
  */
 const sveltekit = function (svelte_config) {
+	const kit_config = svelte_config.kit;
 	return {
 		name: 'vite-plugin-svelte-kit',
 
@@ -52,9 +53,9 @@ const sveltekit = function (svelte_config) {
 						fs: {
 							allow: [
 								...new Set([
-									svelte_config.kit.files.lib,
-									svelte_config.kit.files.routes,
-									svelte_config.kit.outDir,
+									kit_config.files.lib,
+									kit_config.files.routes,
+									kit_config.outDir,
 									path__default.resolve(cwd, 'src'),
 									path__default.resolve(cwd, 'node_modules'),
 									path__default.resolve(searchForWorkspaceRoot(cwd), 'node_modules')
@@ -64,14 +65,11 @@ const sveltekit = function (svelte_config) {
 						port: 3000,
 						strictPort: true,
 						watch: {
-							ignored: [
-								`${svelte_config.kit.outDir}/**`,
-								`!${svelte_config.kit.outDir}/generated/**`
-							]
+							ignored: [`${kit_config.outDir}/**`, `!${kit_config.outDir}/generated/**`]
 						}
 					}
 				},
-				await svelte_config.kit.vite()
+				await kit_config.vite()
 			);
 
 			/** @type {[any, string[]]} */
@@ -79,13 +77,13 @@ const sveltekit = function (svelte_config) {
 				configFile: false,
 				root: cwd,
 				resolve: {
-					alias: get_aliases(svelte_config)
+					alias: get_aliases(kit_config)
 				},
 				build: {
 					rollupOptions: {
 						// Vite dependency crawler needs an explicit JS entry point
 						// eventhough server otherwise works without it
-						input: `${get_runtime_path(svelte_config)}/client/start.js`
+						input: `${get_runtime_path(kit_config)}/client/start.js`
 					}
 				},
 				base: '/'
@@ -101,7 +99,7 @@ const sveltekit = function (svelte_config) {
 
 			init(svelte_config);
 
-			const runtime = get_runtime_path(svelte_config);
+			const runtime = get_runtime_path(kit_config);
 
 			process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = '0';
 
@@ -115,7 +113,7 @@ const sveltekit = function (svelte_config) {
 				const { manifest_data } = update(svelte_config);
 
 				manifest = {
-					appDir: svelte_config.kit.appDir,
+					appDir: kit_config.appDir,
 					assets: new Set(manifest_data.assets.map((asset) => asset.file)),
 					mimeTypes: get_mime_lookup(manifest_data),
 					_: {
@@ -235,16 +233,14 @@ const sveltekit = function (svelte_config) {
 
 			for (const event of ['add', 'unlink']) {
 				vite.watcher.on(event, (file) => {
-					if (file.startsWith(svelte_config.kit.files.routes + path__default.sep)) {
+					if (file.startsWith(kit_config.files.routes + path__default.sep)) {
 						update_manifest();
 					}
 				});
 			}
 
-			const assets = svelte_config.kit.paths.assets
-				? SVELTE_KIT_ASSETS
-				: svelte_config.kit.paths.base;
-			const asset_server = sirv(svelte_config.kit.files.assets, {
+			const assets = kit_config.paths.assets ? SVELTE_KIT_ASSETS : kit_config.paths.base;
+			const asset_server = sirv(kit_config.files.assets, {
 				dev: true,
 				etag: true,
 				maxAge: 0,

package/dist/chunks/sync.js

@@ -168,7 +168,7 @@ const DEFAULT = 'default';
  */
 function create_manifest_data({
 	config,
-	fallback = `${get_runtime_path(config)}/components`,
+	fallback = `${get_runtime_path(config.kit)}/components`,
 	cwd = process.cwd()
 }) {
 	/** @type {import('types').RouteData[]} */
@@ -829,7 +829,7 @@ function write_types(config, manifest_data) {
 /** @param {import('types').ValidatedConfig} config */
 function init(config) {
 	copy_assets(path__default.join(config.kit.outDir, 'runtime'));
-	write_tsconfig(config);
+	write_tsconfig(config.kit);
 }
 
 /** @param {import('types').ValidatedConfig} config */

package/dist/chunks/write_tsconfig.js

@@ -36,9 +36,9 @@ function trim(str) {
 /** @param {string} file */
 const exists = (file) => fs__default.existsSync(file) && file;
 
-/** @param {import('types').ValidatedConfig} config */
+/** @param {import('types').ValidatedKitConfig} config */
 function write_tsconfig(config, cwd = process.cwd()) {
-	const out = path__default.join(config.kit.outDir, 'tsconfig.json');
+	const out = path__default.join(config.outDir, 'tsconfig.json');
 	const user_file =
 		exists(path__default.resolve(cwd, 'tsconfig.json')) || exists(path__default.resolve(cwd, 'jsconfig.json'));
 
@@ -48,11 +48,11 @@ function write_tsconfig(config, cwd = process.cwd()) {
 	const project_relative = (file) => posixify(path__default.relative('.', file));
 
 	/** @param {string} file */
-	const config_relative = (file) => posixify(path__default.relative(config.kit.outDir, file));
+	const config_relative = (file) => posixify(path__default.relative(config.outDir, file));
 
 	const dirs = new Set([
-		project_relative(path__default.dirname(config.kit.files.routes)),
-		project_relative(path__default.dirname(config.kit.files.lib))
+		project_relative(path__default.dirname(config.files.routes)),
+		project_relative(path__default.dirname(config.files.lib))
 	]);
 
 	/** @type {string[]} */
@@ -66,8 +66,8 @@ function write_tsconfig(config, cwd = process.cwd()) {
 	/** @type {Record<string, string[]>} */
 	const paths = {};
 	const alias = {
-		$lib: project_relative(config.kit.files.lib),
-		...config.kit.alias
+		$lib: project_relative(config.files.lib),
+		...config.alias
 	};
 	for (const [key, value] of Object.entries(alias)) {
 		if (fs__default.existsSync(project_relative(value))) {
@@ -113,7 +113,7 @@ function write_tsconfig(config, cwd = process.cwd()) {
 }
 
 /**
- * @param {import('types').ValidatedConfig} config
+ * @param {import('types').ValidatedKitConfig} config
  * @param {string} cwd
  * @param {string} out
  * @param {string} user_file
@@ -132,17 +132,15 @@ function validate(config, cwd, out, user_file) {
 	if (extends_framework_config) {
 		const { paths: user_paths } = user_tsconfig.compilerOptions || {};
 
-		if (user_paths && fs__default.existsSync(config.kit.files.lib)) {
+		if (user_paths && fs__default.existsSync(config.files.lib)) {
 			/** @type {string[]} */
 			const lib = user_paths['$lib'] || [];
 			/** @type {string[]} */
 			const lib_ = user_paths['$lib/*'] || [];
 
 			const missing_lib_paths =
-				!lib.some((relative) => path__default.resolve(cwd, relative) === config.kit.files.lib) ||
-				!lib_.some(
-					(relative) => path__default.resolve(cwd, relative) === path__default.join(config.kit.files.lib, '/*')
-				);
+				!lib.some((relative) => path__default.resolve(cwd, relative) === config.files.lib) ||
+				!lib_.some((relative) => path__default.resolve(cwd, relative) === path__default.join(config.files.lib, '/*'));
 
 			if (missing_lib_paths) {
 				console.warn(
@@ -150,7 +148,7 @@ function validate(config, cwd, out, user_file) {
 						.bold()
 						.yellow(`Your compilerOptions.paths in ${kind} should include the following:`)
 				);
-				const relative = posixify(path__default.relative('.', config.kit.files.lib));
+				const relative = posixify(path__default.relative('.', config.files.lib));
 				console.warn(`{\n  "$lib":["${relative}"],\n  "$lib/*":["${relative}/*"]\n}`);
 			}
 		}

package/dist/cli.js

@@ -218,8 +218,8 @@ async function blame(port) {
 	}
 }
 
-const get_runtime_path = /** @param {import('types').ValidatedConfig} config */ (config) =>
-			posixify_path(path__default.join(config.kit.outDir, 'runtime'))
+const get_runtime_path = /** @param {import('types').ValidatedKitConfig} config */ (config) =>
+			posixify_path(path__default.join(config.outDir, 'runtime'))
 	;
 
 /** @param {string} str */
@@ -292,19 +292,19 @@ function get_mime_lookup(manifest_data) {
 	return mime;
 }
 
-/** @param {import('types').ValidatedConfig} config */
+/** @param {import('types').ValidatedKitConfig} config */
 function get_aliases(config) {
 	/** @type {Record<string, string>} */
 	const alias = {
-		__GENERATED__: path__default.posix.join(config.kit.outDir, 'generated'),
+		__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.kit.files.lib
+		$lib: config.files.lib
 	};
 
-	for (const [key, value] of Object.entries(config.kit.alias)) {
+	for (const [key, value] of Object.entries(config.alias)) {
 		alias[key] = path__default.resolve(value);
 	}
 
@@ -908,7 +908,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.347');
+const prog = sade('svelte-kit').version('1.0.0-next.348');
 
 prog
 	.command('dev')
@@ -1149,7 +1149,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.347'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.348'}\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.347",
+  "version": "1.0.0-next.348",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/ambient.d.ts

@@ -106,7 +106,7 @@ declare module '$app/navigation' {
 		opts?: { replaceState?: boolean; noscroll?: boolean; keepfocus?: boolean; state?: any }
 	): Promise<void>;
 	/**
-	 * Causes any `load` functions belonging to the currently active page to re-run if they `fetch` the resource in question. Returns a `Promise` that resolves when the page is subsequently updated.
+	 * Causes any `load` functions belonging to the currently active page to re-run if they `fetch` the resource in question, or re-fetches data from a page endpoint if the invalidated resource is the page itself. Returns a `Promise` that resolves when the page is subsequently updated.
 	 * @param dependency The invalidated resource
 	 */
 	export function invalidate(dependency: string | ((href: string) => boolean)): Promise<void>;

package/types/index.d.ts

@@ -91,68 +91,70 @@ export interface Builder {
 export interface Config {
 	compilerOptions?: CompileOptions;
 	extensions?: string[];
-	kit?: {
-		adapter?: Adapter;
-		alias?: Record<string, string>;
-		appDir?: string;
-		browser?: {
-			hydrate?: boolean;
-			router?: boolean;
-		};
-		csp?: {
-			mode?: 'hash' | 'nonce' | 'auto';
-			directives?: CspDirectives;
-		};
-		endpointExtensions?: string[];
-		files?: {
-			assets?: string;
-			hooks?: string;
-			lib?: string;
-			params?: string;
-			routes?: string;
-			serviceWorker?: string;
-			template?: string;
-		};
-		floc?: boolean;
-		inlineStyleThreshold?: number;
-		methodOverride?: {
-			parameter?: string;
-			allowed?: string[];
-		};
-		outDir?: string;
-		package?: {
-			dir?: string;
-			emitTypes?: boolean;
-			exports?(filepath: string): boolean;
-			files?(filepath: string): boolean;
-		};
-		paths?: {
-			assets?: string;
-			base?: string;
-		};
-		prerender?: {
-			concurrency?: number;
-			crawl?: boolean;
-			default?: boolean;
-			enabled?: boolean;
-			entries?: Array<'*' | `/${string}`>;
-			onError?: PrerenderOnErrorValue;
-		};
-		routes?: (filepath: string) => boolean;
-		serviceWorker?: {
-			register?: boolean;
-			files?: (filepath: string) => boolean;
-		};
-		trailingSlash?: TrailingSlash;
-		version?: {
-			name?: string;
-			pollInterval?: number;
-		};
-		vite?: import('vite').UserConfig | (() => MaybePromise<import('vite').UserConfig>);
-	};
+	kit?: KitConfig;
 	preprocess?: any;
 }
 
+export interface KitConfig {
+	adapter?: Adapter;
+	alias?: Record<string, string>;
+	appDir?: string;
+	browser?: {
+		hydrate?: boolean;
+		router?: boolean;
+	};
+	csp?: {
+		mode?: 'hash' | 'nonce' | 'auto';
+		directives?: CspDirectives;
+	};
+	endpointExtensions?: string[];
+	files?: {
+		assets?: string;
+		hooks?: string;
+		lib?: string;
+		params?: string;
+		routes?: string;
+		serviceWorker?: string;
+		template?: string;
+	};
+	floc?: boolean;
+	inlineStyleThreshold?: number;
+	methodOverride?: {
+		parameter?: string;
+		allowed?: string[];
+	};
+	outDir?: string;
+	package?: {
+		dir?: string;
+		emitTypes?: boolean;
+		exports?(filepath: string): boolean;
+		files?(filepath: string): boolean;
+	};
+	paths?: {
+		assets?: string;
+		base?: string;
+	};
+	prerender?: {
+		concurrency?: number;
+		crawl?: boolean;
+		default?: boolean;
+		enabled?: boolean;
+		entries?: Array<'*' | `/${string}`>;
+		onError?: PrerenderOnErrorValue;
+	};
+	routes?: (filepath: string) => boolean;
+	serviceWorker?: {
+		register?: boolean;
+		files?: (filepath: string) => boolean;
+	};
+	trailingSlash?: TrailingSlash;
+	version?: {
+		name?: string;
+		pollInterval?: number;
+	};
+	vite?: import('vite').UserConfig | (() => MaybePromise<import('vite').UserConfig>);
+}
+
 export interface ExternalFetch {
 	(req: Request): Promise<Response>;
 }

package/types/internal.d.ts

@@ -5,6 +5,7 @@ import {
 	GetSession,
 	Handle,
 	HandleError,
+	KitConfig,
 	Load,
 	RequestEvent,
 	RequestHandler,
@@ -319,5 +320,7 @@ export type StrictBody = string | Uint8Array;
 
 export type ValidatedConfig = RecursiveRequired<Config>;
 
+export type ValidatedKitConfig = RecursiveRequired<KitConfig>;
+
 export * from './index';
 export * from './private';