@sveltejs/kit 1.2.9 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/core/config/options.js

@@ -226,6 +226,10 @@ const options = object(
 				files: fun((filename) => !/\.DS_Store/.test(filename))
 			}),
 
+			typescript: object({
+				config: fun((config) => config)
+			}),
+
 			version: object({
 				name: string(Date.now().toString()),
 				pollInterval: number(0)
@@ -362,7 +366,7 @@ function list(options, fallback = options[0]) {
 }
 
 /**
- * @param {(filename: string) => boolean} fallback
+ * @param {(...args: any) => any} fallback
  * @returns {Validator}
  */
 function fun(fallback) {

package/src/core/sync/write_tsconfig.js

@@ -34,7 +34,7 @@ function remove_trailing_slashstar(file) {
 }
 
 /**
- * Writes the tsconfig that the user's tsconfig inherits from.
+ * Generates the tsconfig that the user's tsconfig inherits from.
  * @param {import('types').ValidatedKitConfig} kit
  */
 export function write_tsconfig(kit, cwd = process.cwd()) {
@@ -72,6 +72,15 @@ export function write_tsconfig(kit, cwd = process.cwd()) {
 		}
 	}
 
+	write_if_changed(out, JSON.stringify(get_tsconfig(kit, include_base_url), null, '\t'));
+}
+
+/**
+ * Generates the tsconfig that the user's tsconfig inherits from.
+ * @param {import('types').ValidatedKitConfig} kit
+ * @param {boolean} include_base_url
+ */
+export function get_tsconfig(kit, include_base_url) {
 	/** @param {string} file */
 	const config_relative = (file) => posixify(path.relative(kit.outDir, file));
 
@@ -98,40 +107,35 @@ export function write_tsconfig(kit, cwd = process.cwd()) {
 		exclude.push(config_relative(`${kit.files.serviceWorker}.d.ts`));
 	}
 
-	write_if_changed(
-		out,
-		JSON.stringify(
-			{
-				compilerOptions: {
-					// generated options
-					baseUrl: include_base_url ? config_relative('.') : undefined,
-					paths: get_tsconfig_paths(kit, include_base_url),
-					rootDirs: [config_relative('.'), './types'],
-
-					// essential options
-					// svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
-					// to enforce using \`import type\` instead of \`import\` for Types.
-					importsNotUsedAsValues: 'error',
-					// Vite compiles modules one at a time
-					isolatedModules: true,
-					// TypeScript doesn't know about import usages in the template because it only sees the
-					// script of a Svelte file. Therefore preserve all value imports. Requires TS 4.5 or higher.
-					preserveValueImports: true,
-
-					// This is required for svelte-package to work as expected
-					// Can be overwritten
-					lib: ['esnext', 'DOM', 'DOM.Iterable'],
-					moduleResolution: 'node',
-					module: 'esnext',
-					target: 'esnext'
-				},
-				include,
-				exclude
-			},
-			null,
-			'\t'
-		)
-	);
+	const config = {
+		compilerOptions: {
+			// generated options
+			baseUrl: include_base_url ? config_relative('.') : undefined,
+			paths: get_tsconfig_paths(kit, include_base_url),
+			rootDirs: [config_relative('.'), './types'],
+
+			// essential options
+			// svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
+			// to enforce using \`import type\` instead of \`import\` for Types.
+			importsNotUsedAsValues: 'error',
+			// Vite compiles modules one at a time
+			isolatedModules: true,
+			// TypeScript doesn't know about import usages in the template because it only sees the
+			// script of a Svelte file. Therefore preserve all value imports. Requires TS 4.5 or higher.
+			preserveValueImports: true,
+
+			// This is required for svelte-package to work as expected
+			// Can be overwritten
+			lib: ['esnext', 'DOM', 'DOM.Iterable'],
+			moduleResolution: 'node',
+			module: 'esnext',
+			target: 'esnext'
+		},
+		include,
+		exclude
+	};
+
+	return kit.typescript.config(config) ?? config;
 }
 
 /** @param {string} cwd */
@@ -212,7 +216,7 @@ const value_regex = /^(.*?)((\/\*)|(\.\w+))?$/;
  * @param {import('types').ValidatedKitConfig} config
  * @param {boolean} include_base_url
  */
-export function get_tsconfig_paths(config, include_base_url) {
+function get_tsconfig_paths(config, include_base_url) {
 	/** @param {string} file */
 	const config_relative = (file) => posixify(path.relative(config.outDir, file));
 

package/src/runtime/client/client.js

@@ -1531,11 +1531,22 @@ export function create_client({ target, base }) {
 					// with history.go, which means we end up back here, hence this check
 					if (event.state[INDEX_KEY] === current_history_index) return;
 
+					const scroll = scroll_positions[event.state[INDEX_KEY]];
+
+					// if the only change is the hash, we don't need to do anything...
+					if (current.url.href.split('#')[0] === location.href.split('#')[0]) {
+						// ...except handle scroll
+						scroll_positions[current_history_index] = scroll_state();
+						current_history_index = event.state[INDEX_KEY];
+						scrollTo(scroll.x, scroll.y);
+						return;
+					}
+
 					const delta = event.state[INDEX_KEY] - current_history_index;
 
 					navigate({
 						url: new URL(location.href),
-						scroll: scroll_positions[event.state[INDEX_KEY]],
+						scroll,
 						keepfocus: false,
 						redirect_chain: [],
 						details: null,

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

@@ -69,23 +69,23 @@ export async function handle_action_json_request(event, options, server) {
 			});
 		}
 	} catch (e) {
-		const error = normalize_error(e);
+		const err = normalize_error(e);
 
-		if (error instanceof Redirect) {
+		if (err instanceof Redirect) {
 			return action_json({
 				type: 'redirect',
-				status: error.status,
-				location: error.location
+				status: err.status,
+				location: err.location
 			});
 		}
 
 		return action_json(
 			{
 				type: 'error',
-				error: await handle_error_and_jsonify(event, options, check_incorrect_fail_use(error))
+				error: await handle_error_and_jsonify(event, options, check_incorrect_fail_use(err))
 			},
 			{
-				status: error instanceof HttpError ? error.status : 500
+				status: err instanceof HttpError ? err.status : 500
 			}
 		);
 	}
@@ -110,19 +110,18 @@ function action_json(data, init) {
 
 /**
  * @param {import('types').RequestEvent} event
- * @param {import('types').SSRNode} leaf_node
  */
-export function is_action_request(event, leaf_node) {
-	return leaf_node.server && event.request.method !== 'GET' && event.request.method !== 'HEAD';
+export function is_action_request(event) {
+	return event.request.method === 'POST';
 }
 
 /**
  * @param {import('types').RequestEvent} event
- * @param {import('types').SSRNode['server']} server
+ * @param {import('types').SSRNode['server'] | undefined} server
  * @returns {Promise<import('types').ActionResult>}
  */
 export async function handle_action_request(event, server) {
-	const actions = server.actions;
+	const actions = server?.actions;
 
 	if (!actions) {
 		// TODO should this be a different error altogether?
@@ -161,19 +160,19 @@ export async function handle_action_request(event, server) {
 			};
 		}
 	} catch (e) {
-		const error = normalize_error(e);
+		const err = normalize_error(e);
 
-		if (error instanceof Redirect) {
+		if (err instanceof Redirect) {
 			return {
 				type: 'redirect',
-				status: error.status,
-				location: error.location
+				status: err.status,
+				location: err.location
 			};
 		}
 
 		return {
 			type: 'error',
-			error: check_incorrect_fail_use(error)
+			error: check_incorrect_fail_use(err)
 		};
 	}
 }

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

@@ -59,7 +59,7 @@ export async function render_page(event, route, page, options, manifest, state,
 		/** @type {import('types').ActionResult | undefined} */
 		let action_result = undefined;
 
-		if (is_action_request(event, leaf_node)) {
+		if (is_action_request(event)) {
 			// for action requests, first call handler in +page.server.js
 			// (this also determines status code)
 			action_result = await handle_action_request(event, leaf_node.server);
@@ -85,7 +85,7 @@ export async function render_page(event, route, page, options, manifest, state,
 
 		if (should_prerender) {
 			const mod = leaf_node.server;
-			if (mod && mod.actions) {
+			if (mod?.actions) {
 				throw new Error('Cannot prerender pages with actions');
 			}
 		} else if (state.prerendering) {

package/types/index.d.ts

@@ -503,6 +503,14 @@ export interface KitConfig {
 		 */
 		files?(filepath: string): boolean;
 	};
+	typescript?: {
+		/**
+		 * A function that allows you to edit the generated `tsconfig.json`. You can mutate the config (recommended) or return a new one.
+		 * This is useful for — to example — extend a shared `tsconfig.json` in a monorepo root
+		 * @default (config) => config
+		 */
+		config?: (config: Record<string, any>) => Record<string, any> | void;
+	};
 	/**
 	 * Client-side navigation can be buggy if you deploy a new version of your app while people are using it. If the code for the new page is already loaded, it may have stale content; if it isn't, the app's route manifest may point to a JavaScript file that no longer exists. SvelteKit solves this problem by falling back to traditional full-page navigation if it detects that a new version has been deployed, using the `name` specified here (which defaults to a timestamp of the build).
 	 *