@sveltejs/kit 1.0.0-next.216 → 1.0.0-next.217

package/assets/kit.js

@@ -68,21 +68,24 @@ function is_string(s) {
 	return typeof s === 'string' || s instanceof String;
 }
 
+const text_types = new Set([
+	'application/xml',
+	'application/json',
+	'application/x-www-form-urlencoded',
+	'multipart/form-data'
+]);
+
 /**
  * Decides how the body should be parsed based on its mime type. Should match what's in parse_body
  *
  * @param {string | undefined | null} content_type The `content-type` header of a request/response.
  * @returns {boolean}
  */
-function is_content_type_textual(content_type) {
+function is_text(content_type) {
 	if (!content_type) return true; // defaults to json
-	const [type] = content_type.split(';'); // get the mime type
-	return (
-		type === 'text/plain' ||
-		type === 'application/json' ||
-		type === 'application/x-www-form-urlencoded' ||
-		type === 'multipart/form-data'
-	);
+	const type = content_type.split(';')[0].toLowerCase(); // get the mime type
+
+	return type.startsWith('text/') || type.endsWith('+xml') || text_types.has(type);
 }
 
 /**
@@ -121,9 +124,7 @@ async function render_endpoint(request, route, match) {
 	headers = lowercase_keys(headers);
 	const type = get_single_valued_header(headers, 'content-type');
 
-	const is_type_textual = is_content_type_textual(type);
-
-	if (!is_type_textual && !(body instanceof Uint8Array || is_string(body))) {
+	if (!is_text(type) && !(body instanceof Uint8Array || is_string(body))) {
 		return error(
 			`${preface}: body must be an instance of string or Uint8Array if content-type is not a supported textual content-type`
 		);

package/assets/runtime/internal/start.js

@@ -1,6 +1,7 @@
 import Root from '../../generated/root.svelte';
 import { fallback, routes } from '../../generated/manifest.js';
 import { g as get_base_uri } from '../chunks/utils.js';
+import { tick } from 'svelte';
 import { writable } from 'svelte/store';
 import { init } from './singletons.js';
 import { set_paths } from '../paths.js';
@@ -661,7 +662,7 @@ class Renderer {
 			this._init(navigation_result);
 		}
 
-		// opts must be passed if we're navigating...
+		// opts must be passed if we're navigating
 		if (opts) {
 			const { hash, scroll, keepfocus } = opts;
 
@@ -670,7 +671,8 @@ class Renderer {
 				document.body.focus();
 			}
 
-			await 0;
+			// need to render the DOM before we can scroll to the rendered elements
+			await tick();
 
 			if (this.autoscroll) {
 				const deep_linked = hash && document.getElementById(hash.slice(1));
@@ -686,8 +688,8 @@ class Renderer {
 				}
 			}
 		} else {
-			// ...they will not be supplied if we're simply invalidating
-			await 0;
+			// in this case we're simply invalidating
+			await tick();
 		}
 
 		this.loading.promise = null;

package/dist/chunks/error.js

@@ -9,13 +9,4 @@ function coalesce_to_error(err) {
 		: new Error(JSON.stringify(err));
 }
 
-/**
- * @param {Error} err
- * @param {any} errorCode
- * @return {err is Error & {code: any}}
- */
-function has_error_code(err, errorCode = undefined) {
-	return 'code' in err && (errorCode === undefined || /** @type {any} */ (err).code === errorCode);
-}
-
-export { coalesce_to_error as c, has_error_code as h };
+export { coalesce_to_error as c };

package/dist/cli.js

@@ -1,12 +1,12 @@
-import fs__default, { existsSync } from 'fs';
 import sade from 'sade';
 import path__default, { relative } from 'path';
 import { exec as exec$1 } from 'child_process';
 import { createConnection, createServer } from 'net';
+import fs__default from 'fs';
 import * as url from 'url';
 import { fileURLToPath } from 'url';
 import { networkInterfaces, release } from 'os';
-import { c as coalesce_to_error, h as has_error_code } from './chunks/error.js';
+import { c as coalesce_to_error } from './chunks/error.js';
 
 let FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM, isTTY=true;
 if (typeof process !== 'undefined') {
@@ -762,10 +762,14 @@ function load_template(cwd, config) {
 }
 
 async function load_config({ cwd = process.cwd() } = {}) {
-	const config_file_esm = path__default.join(cwd, 'svelte.config.js');
-	const config_file = fs__default.existsSync(config_file_esm)
-		? config_file_esm
-		: path__default.join(cwd, 'svelte.config.cjs');
+	const config_file = path__default.join(cwd, 'svelte.config.js');
+
+	if (!fs__default.existsSync(config_file)) {
+		throw new Error(
+			'You need to create a svelte.config.js file. See https://kit.svelte.dev/docs#configuration'
+		);
+	}
+
 	const config = await import(url.pathToFileURL(config_file).href);
 
 	const validated = validate_config(config.default);
@@ -785,17 +789,9 @@ async function load_config({ cwd = process.cwd() } = {}) {
  * @returns {import('types/config').ValidatedConfig}
  */
 function validate_config(config) {
-	const type = typeof config;
-
-	if (type === 'undefined') {
-		throw new Error(
-			'Your config is missing default exports. Make sure to include "export default config;"'
-		);
-	}
-
-	if (type !== 'object') {
+	if (typeof config !== 'object') {
 		throw new Error(
-			`Unexpected config type "${type}", make sure your default export is an object.`
+			'svelte.config.js must have a configuration object as its default export. See https://kit.svelte.dev/docs#configuration'
 		);
 	}
 
@@ -817,52 +813,17 @@ function print_config_conflicts(conflicts, pathPrefix = '', scope) {
 	});
 }
 
-async function get_config() {
-	// TODO this is temporary, for the benefit of early adopters
-	if (existsSync('svelte.config.cjs')) {
-		// prettier-ignore
-		console.error($.bold().red(
-			'svelte.config.cjs should be renamed to svelte.config.js and converted to an ES module. See https://kit.svelte.dev/docs#configuration for an example'
-		));
-	}
-
-	if (existsSync('vite.config.js')) {
-		// prettier-ignore
-		console.error($.bold().red(
-			'Please remove vite.config.js and put Vite config in svelte.config.js: https://kit.svelte.dev/docs#configuration-vite'
-		));
-	}
+/** @param {unknown} e */
+function handle_error(e) {
+	const error = coalesce_to_error(e);
 
-	try {
-		return await load_config();
-	} catch (err) {
-		const error = coalesce_to_error(err);
-		let message = error.message;
-
-		if (
-			has_error_code(error, 'MODULE_NOT_FOUND') &&
-			/Cannot find module svelte\.config\./.test(error.message)
-		) {
-			message = 'Missing svelte.config.js';
-		} else if (error.name === 'SyntaxError') {
-			message = 'Malformed svelte.config.js';
-		}
+	if (error.name === 'SyntaxError') throw error;
 
-		console.error($.bold().red(message));
-		if (error.stack) {
-			console.error($.grey(error.stack));
-		}
-		process.exit(1);
+	console.log($.bold().red(`> ${error.message}`));
+	if (error.stack) {
+		console.log($.gray(error.stack.split('\n').slice(1).join('\n')));
 	}
-}
 
-/** @param {unknown} error */
-function handle_error(error) {
-	const err = coalesce_to_error(error);
-	console.log($.bold().red(`> ${err.message}`));
-	if (err.stack) {
-		console.log($.gray(err.stack));
-	}
 	process.exit(1);
 }
 
@@ -885,7 +846,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.216');
+const prog = sade('svelte-kit').version('1.0.0-next.217');
 
 prog
 	.command('dev')
@@ -895,12 +856,12 @@ prog
 	.option('-H, --https', 'Use self-signed HTTPS certificate')
 	.option('-o, --open', 'Open a browser tab')
 	.action(async ({ port, host, https, open }) => {
-		process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-		const config = await get_config();
+		try {
+			process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+			const config = await load_config();
 
-		const { dev } = await import('./chunks/index.js');
+			const { dev } = await import('./chunks/index.js');
 
-		try {
 			const cwd = process.cwd();
 
 			const { address_info, server_config } = await dev({
@@ -930,10 +891,10 @@ prog
 	.describe('Create a production build of your app')
 	.option('--verbose', 'Log more stuff', false)
 	.action(async ({ verbose }) => {
-		process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-		const config = await get_config();
-
 		try {
+			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+			const config = await load_config();
+
 			const { build } = await import('./chunks/index3.js');
 			const build_data = await build(config);
 
@@ -968,14 +929,14 @@ prog
 	.option('-H, --https', 'Use self-signed HTTPS certificate', false)
 	.option('-o, --open', 'Open a browser tab', false)
 	.action(async ({ port, host, https, open }) => {
-		await check_port(port);
+		try {
+			await check_port(port);
 
-		process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-		const config = await get_config();
+			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+			const config = await load_config();
 
-		const { preview } = await import('./chunks/index6.js');
+			const { preview } = await import('./chunks/index6.js');
 
-		try {
 			await preview({ port, host, config, https });
 
 			welcome({ port, host, https, open });
@@ -989,11 +950,11 @@ prog
 	.describe('Create a package')
 	.option('-d, --dir', 'Destination directory', 'package')
 	.action(async () => {
-		const config = await get_config();
+		try {
+			const config = await load_config();
 
-		const { make_package } = await import('./chunks/index7.js');
+			const { make_package } = await import('./chunks/index7.js');
 
-		try {
 			await make_package(config);
 		} catch (error) {
 			handle_error(error);
@@ -1037,7 +998,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.216'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.217'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/ssr.js

@@ -50,21 +50,24 @@ function is_string(s) {
 	return typeof s === 'string' || s instanceof String;
 }
 
+const text_types = new Set([
+	'application/xml',
+	'application/json',
+	'application/x-www-form-urlencoded',
+	'multipart/form-data'
+]);
+
 /**
  * Decides how the body should be parsed based on its mime type. Should match what's in parse_body
  *
  * @param {string | undefined | null} content_type The `content-type` header of a request/response.
  * @returns {boolean}
  */
-function is_content_type_textual(content_type) {
+function is_text(content_type) {
 	if (!content_type) return true; // defaults to json
-	const [type] = content_type.split(';'); // get the mime type
-	return (
-		type === 'text/plain' ||
-		type === 'application/json' ||
-		type === 'application/x-www-form-urlencoded' ||
-		type === 'multipart/form-data'
-	);
+	const type = content_type.split(';')[0].toLowerCase(); // get the mime type
+
+	return type.startsWith('text/') || type.endsWith('+xml') || text_types.has(type);
 }
 
 /**
@@ -103,9 +106,7 @@ async function render_endpoint(request, route, match) {
 	headers = lowercase_keys(headers);
 	const type = get_single_valued_header(headers, 'content-type');
 
-	const is_type_textual = is_content_type_textual(type);
-
-	if (!is_type_textual && !(body instanceof Uint8Array || is_string(body))) {
+	if (!is_text(type) && !(body instanceof Uint8Array || is_string(body))) {
 		return error(
 			`${preface}: body must be an instance of string or Uint8Array if content-type is not a supported textual content-type`
 		);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.216",
+  "version": "1.0.0-next.217",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -39,6 +39,7 @@
     "sirv": "^1.0.19",
     "svelte": "^3.44.2",
     "svelte-check": "^2.2.10",
+    "svelte-preprocess": "^4.9.8",
     "svelte2tsx": "~0.4.10",
     "tiny-glob": "^0.2.9",
     "uvu": "^0.5.2"