npm - @sveltejs/kit - Versions diffs - 1.0.0-next.245 → 1.0.0-next.249 - Mend

@sveltejs/kit 1.0.0-next.245 → 1.0.0-next.249

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/assets/server/index.js CHANGED Viewed

@@ -1546,7 +1546,7 @@ async function load_node({
 				// handle fetch requests for static assets. e.g. prebaked data, etc.
 				// we need to support everything the browser's fetch supports
 				const prefix = options.paths.assets || options.paths.base;
-				const filename = (
+				const filename = decodeURIComponent(
 					resolved.startsWith(prefix) ? resolved.slice(prefix.length) : resolved
 				).slice(1);
 				const filename_html = `${filename}/index.html`; // path may also match path/index.html

package/dist/chunks/amp_hook.js ADDED Viewed

@@ -0,0 +1,56 @@
+/** @type {import('amphtml-validator').Validator} */
+const amp = await (await import('./index8.js').then(function (n) { return n.i; })).getInstance();
+/** @type {import('types/hooks').Handle} */
+async function handle({ event, resolve }) {
+	const response = await resolve(event);
+	if (response.headers.get('content-type') !== 'text/html') {
+		return response;
+	}
+	let rendered = await response.text();
+	const result = amp.validateString(rendered);
+	if (result.status !== 'PASS') {
+		const lines = rendered.split('\n');
+		/** @param {string} str */
+		const escape = (str) => str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+		rendered = `<!doctype html>
+		<head>
+			<meta charset="utf-8" />
+			<meta name="viewport" content="width=device-width, initial-scale=1" />
+			<style>
+				body {
+					font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+					color: #333;
+				}
+				pre {
+					background: #f4f4f4;
+					padding: 1em;
+					overflow-x: auto;
+				}
+			</style>
+		</head>
+		<h1>AMP validation failed</h1>
+		${result.errors
+			.map(
+				(error) => `
+			<h2>${error.severity}</h2>
+			<p>Line ${error.line}, column ${error.col}: ${error.message} (<a href="${error.specUrl}">${
+					error.code
+				}</a>)</p>
+			<pre>${escape(lines[error.line - 1])}</pre>
+		`
+			)
+			.join('\n\n')}
+	`;
+	}
+	return new Response(rendered, { status: response.status, headers: response.headers });
+}
+export { handle };

package/dist/chunks/index.js CHANGED Viewed

@@ -10,6 +10,7 @@ import { e as escape_html_attr, r as resolve, i as is_root_relative, a as escape
 import { s } from './misc.js';
 import { __fetch_polyfill } from '../install-fetch.js';
 import { getRequest, setResponse } from '../node.js';
+import { sequence } from '../hooks.js';
 import 'sade';
 import 'child_process';
 import 'net';
@@ -1440,7 +1441,7 @@ async function load_node({
 				// handle fetch requests for static assets. e.g. prebaked data, etc.
 				// we need to support everything the browser's fetch supports
 				const prefix = options.paths.assets || options.paths.base;
-				const filename = (
+				const filename = decodeURIComponent(
 					resolved.startsWith(prefix) ? resolved.slice(prefix.length) : resolved
 				).slice(1);
 				const filename_html = `${filename}/index.html`; // path may also match path/index.html
@@ -2262,12 +2263,12 @@ async function respond(request, options, state = {}) {
  * @returns {Promise<import('vite').Plugin>}
  */
 async function create_plugin(config, cwd) {
-	/** @type {import('amphtml-validator').Validator} */
+	/** @type {import('types/hooks').Handle} */
 	let amp;
 	if (config.kit.amp) {
 		process.env.VITE_SVELTEKIT_AMP = 'true';
-		amp = await (await import('./index8.js').then(function (n) { return n.i; })).getInstance();
+		amp = (await import('./amp_hook.js')).handle;
 	}
 	return {
@@ -2409,10 +2410,12 @@ async function create_plugin(config, cwd) {
 							? await vite.ssrLoadModule(`/${config.kit.files.hooks}`)
 							: {};
+						const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
 						/** @type {import('types/internal').Hooks} */
 						const hooks = {
 							getSession: user_hooks.getSession || (() => ({})),
-							handle: user_hooks.handle || (({ event, resolve }) => resolve(event)),
+							handle: amp ? sequence(amp, handle) : handle,
 							handleError:
 								user_hooks.handleError ||
 								(({ /** @type {Error & { frame?: string }} */ error }) => {
@@ -2499,58 +2502,14 @@ async function create_plugin(config, cwd) {
 							router: config.kit.router,
 							target: config.kit.target,
 							template: ({ head, body, assets, nonce }) => {
-								let rendered = template
-									.replace(/%svelte\.assets%/g, assets)
-									.replace(/%svelte\.nonce%/g, nonce)
-									// head and body must be replaced last, in case someone tries to sneak in %svelte.assets% etc
-									.replace('%svelte.head%', () => head)
-									.replace('%svelte.body%', () => body);
-								if (amp) {
-									const result = amp.validateString(rendered);
-									if (result.status !== 'PASS') {
-										const lines = rendered.split('\n');
-										/** @param {string} str */
-										const escape = (str) =>
-											str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-										rendered = `<!doctype html>
-										<head>
-											<meta charset="utf-8" />
-											<meta name="viewport" content="width=device-width, initial-scale=1" />
-											<style>
-												body {
-													font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-													color: #333;
-												}
-												pre {
-													background: #f4f4f4;
-													padding: 1em;
-													overflow-x: auto;
-												}
-											</style>
-										</head>
-										<h1>AMP validation failed</h1>
-										${result.errors
-											.map(
-												(error) => `
-											<h2>${error.severity}</h2>
-											<p>Line ${error.line}, column ${error.col}: ${error.message} (<a href="${error.specUrl}">${
-													error.code
-												}</a>)</p>
-											<pre>${escape(lines[error.line - 1])}</pre>
-										`
-											)
-											.join('\n\n')}
-									`;
-									}
-								}
-								return rendered;
+								return (
+									template
+										.replace(/%svelte\.assets%/g, assets)
+										.replace(/%svelte\.nonce%/g, nonce)
+										// head and body must be replaced last, in case someone tries to sneak in %svelte.assets% etc
+										.replace('%svelte.head%', () => head)
+										.replace('%svelte.body%', () => body)
+								);
 							},
 							template_contains_nonce: template.includes('%svelte.nonce%'),
 							trailing_slash: config.kit.trailingSlash
@@ -2710,14 +2669,6 @@ async function dev({ cwd, port, host, https, config }) {
 		merged_config.server.https = https;
 	}
-	// by default, when enabling HTTPS in Vite, it also enables HTTP/2
-	// however, node-fetch's Request implementation does not like the HTTP/2 headers
-	// we set a no-op proxy config to force Vite to downgrade to TLS-only
-	// see https://vitejs.dev/config/#server-https
-	if (merged_config.server.https && !merged_config.server.proxy) {
-		merged_config.server.proxy = {};
-	}
 	if (port) {
 		merged_config.server.port = port;
 	}

package/dist/chunks/index2.js CHANGED Viewed

@@ -455,17 +455,16 @@ function create_manifest_data({
 				}
 			});
-			if (name[0] === '_') {
-				if (name[1] === '_' && !specials.has(name)) {
-					throw new Error(`Files and directories prefixed with __ are reserved (saw ${file})`);
-				}
-				return;
+			if (basename.startsWith('__') && !specials.has(name)) {
+				throw new Error(`Files and directories prefixed with __ are reserved (saw ${file})`);
 			}
-			if (basename[0] === '.' && basename !== '.well-known') return null;
 			if (!is_dir && !/^(\.[a-z0-9]+)+$/i.test(ext)) return null; // filter out tmp files etc
+			if (!config.kit.routes(file)) {
+				return;
+			}
 			const segment = is_dir ? basename : name;
 			if (/\]\[/.test(segment)) {

package/dist/chunks/index3.js CHANGED Viewed

@@ -626,6 +626,7 @@ async function build(config) {
 	const build_data = {
 		app_dir: config.kit.appDir,
 		manifest_data: options.manifest_data,
+		service_worker: options.service_worker_entry_file ? 'service_worker.js' : null, // TODO make file configurable?
 		client,
 		server,
 		static: options.manifest_data.assets.map((asset) => posixify(asset.file)),

package/dist/chunks/index4.js CHANGED Viewed

@@ -47,10 +47,15 @@ function generate_manifest(
 			? (path) => `() => import('${path}')`
 			: (path) => `() => Promise.resolve().then(() => require('${path}'))`;
+	const assets = build_data.manifest_data.assets.map((asset) => asset.file);
+	if (build_data.service_worker) {
+		assets.push(build_data.service_worker);
+	}
 	// prettier-ignore
 	return `{
 		appDir: ${s(build_data.app_dir)},
-		assets: new Set(${s(build_data.manifest_data.assets.map(asset => asset.file))}),
+		assets: new Set(${s(assets)}),
 		_: {
 			mime: ${s(get_mime_lookup(build_data.manifest_data))},
 			entry: ${s(build_data.client.entry)},

package/dist/chunks/index7.js CHANGED Viewed

@@ -15254,18 +15254,23 @@ const essential_files = ['README', 'LICENSE', 'CHANGELOG', '.gitignore', '.npmig
  * @param {string} cwd
  */
 async function make_package(config, cwd = process.cwd()) {
-	const package_dir = config.kit.package.dir;
-	const abs_package_dir = path.isAbsolute(package_dir) ? package_dir : path.join(cwd, package_dir);
-	rimraf(abs_package_dir);
-	mkdirp(abs_package_dir); // TODO https://github.com/sveltejs/kit/issues/2333
+	if (!fs.existsSync(config.kit.files.lib)) {
+		throw new Error(`${config.kit.files.lib} does not exist`);
+	}
+	const package_dir = path.isAbsolute(config.kit.package.dir)
+		? config.kit.package.dir
+		: path.join(cwd, config.kit.package.dir);
+	rimraf(package_dir);
+	mkdirp(package_dir); // TODO https://github.com/sveltejs/kit/issues/2333
 	if (config.kit.package.emitTypes) {
 		// Generate type definitions first so hand-written types can overwrite generated ones
 		await emit_dts(config);
 		// Resolve aliases, TS leaves them as-is
-		const files = walk$1(abs_package_dir);
+		const files = walk$1(package_dir);
 		for (const file of files) {
-			const filename = path.join(abs_package_dir, file);
+			const filename = path.join(package_dir, file);
 			const source = fs.readFileSync(filename, 'utf8');
 			fs.writeFileSync(filename, resolve_$lib_alias(file, source, config));
 		}
@@ -15292,7 +15297,7 @@ async function make_package(config, cwd = process.cwd()) {
 		if (!config.kit.package.files(normalized)) {
 			const dts_file = (svelte_ext ? file : file.slice(0, -ext.length)) + '.d.ts';
-			const dts_path = path.join(abs_package_dir, dts_file);
+			const dts_path = path.join(package_dir, dts_file);
 			if (fs.existsSync(dts_path)) {
 				fs.unlinkSync(dts_path);
@@ -15327,7 +15332,7 @@ async function make_package(config, cwd = process.cwd()) {
 			out_file = file;
 			out_contents = source.toString('utf-8');
 			out_contents = resolve_$lib_alias(out_file, out_contents, config);
-			if (fs.existsSync(path.join(abs_package_dir, out_file))) {
+			if (fs.existsSync(path.join(package_dir, out_file))) {
 				console.warn(
 					'Found already existing file from d.ts generation for ' +
 						out_file +
@@ -15343,7 +15348,7 @@ async function make_package(config, cwd = process.cwd()) {
 			out_contents = source;
 		}
-		write(path.join(abs_package_dir, out_file), out_contents);
+		write(path.join(package_dir, out_file), out_contents);
 		if (config.kit.package.exports(normalized)) {
 			const original = `$lib/${normalized}`;
@@ -15390,7 +15395,7 @@ async function make_package(config, cwd = process.cwd()) {
 		}
 	}
-	write(path.join(abs_package_dir, 'package.json'), JSON.stringify(pkg, null, '  '));
+	write(path.join(package_dir, 'package.json'), JSON.stringify(pkg, null, 2));
 	const whitelist = fs.readdirSync(cwd).filter((file) => {
 		const lowercased = file.toLowerCase();
@@ -15400,7 +15405,7 @@ async function make_package(config, cwd = process.cwd()) {
 		const full_path = path.join(cwd, pathname);
 		if (fs.lstatSync(full_path).isDirectory()) continue; // just to be sure
-		const package_path = path.join(abs_package_dir, pathname);
+		const package_path = path.join(package_dir, pathname);
 		if (!fs.existsSync(package_path)) fs.copyFileSync(full_path, package_path);
 	}
@@ -15568,8 +15573,7 @@ async function try_load_svelte2tsx() {
 			return await import('svelte2tsx');
 		} catch (e) {
 			throw new Error(
-				'You need to install svelte2tsx and typescript if you want to generate type definitions\n' +
-					e
+				'You need svelte2tsx and typescript if you want to generate type definitions. Install it through your package manager, or disable generation which is highly discouraged. See https://kit.svelte.dev/docs#packaging'
 			);
 		}
 	}

package/dist/cli.js CHANGED Viewed

@@ -676,6 +676,8 @@ const options = object(
 			router: boolean(true),
+			routes: fun((filepath) => !/(?:(?:^_|\/_)|(?:^\.|\/\.)(?!well-known))/.test(filepath)),
 			serviceWorker: object({
 				register: boolean(true),
 				files: fun((filename) => !/\.DS_STORE/.test(filename))
@@ -986,17 +988,20 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
-const prog = sade('svelte-kit').version('1.0.0-next.245');
+const prog = sade('svelte-kit').version('1.0.0-next.249');
 prog
 	.command('dev')
 	.describe('Start a development server')
 	.option('-p, --port', 'Port')
-	.option('-h, --host', 'Host (only use this on trusted networks)')
-	.option('-H, --https', 'Use self-signed HTTPS certificate')
 	.option('-o, --open', 'Open a browser tab')
-	.action(async ({ port, host, https, open }) => {
+	.option('--host', 'Host (only use this on trusted networks)')
+	.option('--https', 'Use self-signed HTTPS certificate')
+	.option('-H', 'no longer supported, use --https instead') // TODO remove for 1.0
+	.action(async ({ port, host, https, open, H }) => {
 		try {
+			if (H) throw new Error('-H is no longer supported — use --https instead');
 			process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 			const config = await load_config();
@@ -1065,11 +1070,14 @@ prog
 	.command('preview')
 	.describe('Serve an already-built app')
 	.option('-p, --port', 'Port', 3000)
-	.option('-h, --host', 'Host (only use this on trusted networks)', 'localhost')
-	.option('-H, --https', 'Use self-signed HTTPS certificate', false)
 	.option('-o, --open', 'Open a browser tab', false)
-	.action(async ({ port, host, https, open }) => {
+	.option('--host', 'Host (only use this on trusted networks)', 'localhost')
+	.option('--https', 'Use self-signed HTTPS certificate', false)
+	.option('-H', 'no longer supported, use --https instead') // TODO remove for 1.0
+	.action(async ({ port, host, https, open, H }) => {
 		try {
+			if (H) throw new Error('-H is no longer supported — use --https instead');
 			await check_port(port);
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
@@ -1138,7 +1146,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.245'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.249'}\n`));
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/node.js CHANGED Viewed

@@ -52,9 +52,19 @@ function get_raw_body(req) {
 /** @type {import('@sveltejs/kit/node').GetRequest} */
 async function getRequest(base, req) {
+	let headers = /** @type {Record<string, string>} */ (req.headers);
+	if (req.httpVersionMajor === 2) {
+		// we need to strip out the HTTP/2 pseudo-headers because node-fetch's
+		// Request implementation doesn't like them
+		headers = Object.assign({}, headers);
+		delete headers[':method'];
+		delete headers[':path'];
+		delete headers[':authority'];
+		delete headers[':scheme'];
+	}
 	return new Request(base + req.url, {
 		method: req.method,
-		headers: /** @type {Record<string, string>} */ (req.headers),
+		headers,
 		body: await get_raw_body(req) // TODO stream rather than buffer
 	});
 }

package/package.json CHANGED Viewed

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

package/types/config.d.ts CHANGED Viewed

@@ -155,6 +155,7 @@ export interface Config {
 			onError?: PrerenderOnErrorValue;
 		};
 		router?: boolean;
+		routes?: (filepath: string) => boolean;
 		serviceWorker?: {
 			register?: boolean;
 			files?: (filepath: string) => boolean;

package/types/internal.d.ts CHANGED Viewed

@@ -209,6 +209,7 @@ export interface ManifestData {
 export interface BuildData {
 	app_dir: string;
 	manifest_data: ManifestData;
+	service_worker: string | null;
 	client: {
 		assets: OutputAsset[];
 		chunks: OutputChunk[];