@sveltejs/kit 1.0.0-next.220 → 1.0.0-next.224

package/dist/chunks/index.js

@@ -225,6 +225,7 @@ async function create_plugin(config, output, cwd) {
 								hooks,
 								hydrate: config.kit.hydrate,
 								manifest,
+								method_override: config.kit.methodOverride,
 								paths: {
 									base: config.kit.paths.base,
 									assets: config.kit.paths.assets ? SVELTE_KIT_ASSETS : config.kit.paths.base
@@ -234,7 +235,6 @@ async function create_plugin(config, output, cwd) {
 								read: (file) => fs__default.readFileSync(path__default.join(config.kit.files.assets, file)),
 								root,
 								router: config.kit.router,
-								ssr: config.kit.ssr,
 								target: config.kit.target,
 								template: ({ head, body, assets }) => {
 									let rendered = load_template(cwd, config)

package/dist/chunks/index3.js

@@ -307,6 +307,7 @@ export class App {
 			hooks,
 			hydrate: ${s(config.kit.hydrate)},
 			manifest,
+			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },
 			prefix: assets + '/${config.kit.appDir}/',
 			prerender: ${config.kit.prerender.enabled},
@@ -314,7 +315,6 @@ export class App {
 			root,
 			service_worker: ${has_service_worker ? "'/service-worker.js'" : 'null'},
 			router: ${s(config.kit.router)},
-			ssr: ${s(config.kit.ssr)},
 			target: ${s(config.kit.target)},
 			template,
 			trailing_slash: ${s(config.kit.trailingSlash)}

package/dist/chunks/index5.js

@@ -98,58 +98,194 @@ function queue(concurrency) {
 	};
 }
 
-/**
- * @typedef {import('types/config').PrerenderErrorHandler} PrerenderErrorHandler
- * @typedef {import('types/config').PrerenderOnErrorValue} OnError
- * @typedef {import('types/internal').Logger} Logger
- */
+const DOCTYPE = 'DOCTYPE';
+const CDATA_OPEN = '[CDATA[';
+const CDATA_CLOSE = ']]>';
+const COMMENT_OPEN = '--';
+const COMMENT_CLOSE = '-->';
+
+const TAG_OPEN = /[a-zA-Z]/;
+const TAG_CHAR = /[a-zA-Z0-9]/;
+const ATTRIBUTE_NAME = /[^\t\n\f />"'=]/;
+
+const EXTERNAL = /\bexternal\b/;
+
+const WHITESPACE = /[\s\n\r]/;
 
 /** @param {string} html */
-function clean_html(html) {
-	return html
-		.replace(/<!\[CDATA\[[\s\S]*?\]\]>/gm, '')
-		.replace(/(<script[\s\S]*?>)[\s\S]*?<\/script>/gm, '$1</' + 'script>')
-		.replace(/(<style[\s\S]*?>)[\s\S]*?<\/style>/gm, '$1</' + 'style>')
-		.replace(/<!--[\s\S]*?-->/gm, '');
-}
+function crawl(html) {
+	/** @type {string[]} */
+	const hrefs = [];
 
-/** @param {string} attrs */
-function get_href(attrs) {
-	const match = /(?:[\s'"]|^)href\s*=\s*(?:"(.*?)"|'(.*?)'|([^\s>]*))/.exec(attrs);
-	return match && (match[1] || match[2] || match[3]);
-}
+	let i = 0;
+	main: while (i < html.length) {
+		const char = html[i];
 
-/** @param {string} attrs */
-function get_src(attrs) {
-	const match = /(?:[\s'"]|^)src\s*=\s*(?:"(.*?)"|'(.*?)'|([^\s>]*))/.exec(attrs);
-	return match && (match[1] || match[2] || match[3]);
-}
+		if (char === '<') {
+			if (html[i + 1] === '!') {
+				i += 2;
 
-/** @param {string} attrs */
-function is_rel_external(attrs) {
-	const match = /rel\s*=\s*(?:["'][^>]*(external)[^>]*["']|(external))/.exec(attrs);
-	return !!match;
-}
+				if (html.substr(i, DOCTYPE.length).toUpperCase() === DOCTYPE) {
+					i += DOCTYPE.length;
+					while (i < html.length) {
+						if (html[i++] === '>') {
+							continue main;
+						}
+					}
+				}
+
+				// skip cdata
+				if (html.substr(i, CDATA_OPEN.length) === CDATA_OPEN) {
+					i += CDATA_OPEN.length;
+					while (i < html.length) {
+						if (html.substr(i, CDATA_CLOSE.length) === CDATA_CLOSE) {
+							i += CDATA_CLOSE.length;
+							continue main;
+						}
+
+						i += 1;
+					}
+				}
+
+				// skip comments
+				if (html.substr(i, COMMENT_OPEN.length) === COMMENT_OPEN) {
+					i += COMMENT_OPEN.length;
+					while (i < html.length) {
+						if (html.substr(i, COMMENT_CLOSE.length) === COMMENT_CLOSE) {
+							i += COMMENT_CLOSE.length;
+							continue main;
+						}
+
+						i += 1;
+					}
+				}
+			}
+
+			// parse opening tags
+			const start = ++i;
+			if (TAG_OPEN.test(html[start])) {
+				while (i < html.length) {
+					if (!TAG_CHAR.test(html[i])) {
+						break;
+					}
+
+					i += 1;
+				}
+
+				const tag = html.slice(start, i).toUpperCase();
+
+				if (tag === 'SCRIPT' || tag === 'STYLE') {
+					while (i < html.length) {
+						if (
+							html[i] === '<' &&
+							html[i + 1] === '/' &&
+							html.substr(i + 2, tag.length).toUpperCase() === tag
+						) {
+							continue main;
+						}
+
+						i += 1;
+					}
+				}
+
+				let rel = '';
+				let href = '';
+
+				while (i < html.length) {
+					const start = i;
+
+					const char = html[start];
+					if (char === '>') break;
+
+					if (ATTRIBUTE_NAME.test(char)) {
+						i += 1;
+
+						while (i < html.length) {
+							if (!ATTRIBUTE_NAME.test(html[i])) {
+								break;
+							}
 
-/** @param {string} attrs */
-function get_srcset_urls(attrs) {
-	const results = [];
-	// Note that the srcset allows any ASCII whitespace, including newlines.
-	const match = /([\s'"]|^)srcset\s*=\s*(?:"(.*?)"|'(.*?)'|([^\s>]*))/s.exec(attrs);
-	if (match) {
-		const attr_content = match[1] || match[2] || match[3];
-		// Parse the content of the srcset attribute.
-		// The regexp is modelled after the srcset specs (https://html.spec.whatwg.org/multipage/images.html#srcset-attribute)
-		// and should cover most reasonable cases.
-		const regex = /\s*([^\s,]\S+[^\s,])\s*((?:\d+w)|(?:-?\d+(?:\.\d+)?(?:[eE]-?\d+)?x))?/gm;
-		let sub_matches;
-		while ((sub_matches = regex.exec(attr_content))) {
-			results.push(sub_matches[1]);
+							i += 1;
+						}
+
+						const name = html.slice(start, i).toLowerCase();
+
+						while (WHITESPACE.test(html[i])) i += 1;
+
+						if (html[i] === '=') {
+							i += 1;
+							while (WHITESPACE.test(html[i])) i += 1;
+
+							let value;
+
+							if (html[i] === "'" || html[i] === '"') {
+								const quote = html[i++];
+
+								const start = i;
+								let escaped = false;
+
+								while (i < html.length) {
+									if (!escaped) {
+										const char = html[i];
+
+										if (html[i] === quote) {
+											break;
+										}
+
+										if (char === '\\') {
+											escaped = true;
+										}
+									}
+
+									i += 1;
+								}
+
+								value = html.slice(start, i);
+							} else {
+								const start = i;
+								while (html[i] !== '>' && !WHITESPACE.test(html[i])) i += 1;
+								value = html.slice(start, i);
+
+								i -= 1;
+							}
+
+							if (name === 'rel') {
+								rel = value;
+							} else if (name === 'href') {
+								href = value;
+							} else if (name === 'src') {
+								hrefs.push(value);
+							} else if (name === 'srcset') {
+								const candidates = value.split(',');
+								for (const candidate of candidates) {
+									const src = candidate.trim().split(WHITESPACE)[0];
+									hrefs.push(src);
+								}
+							}
+						}
+					}
+
+					i += 1;
+				}
+
+				if (href && !EXTERNAL.test(rel)) {
+					hrefs.push(href);
+				}
+			}
 		}
+
+		i += 1;
 	}
-	return results;
+
+	return hrefs;
 }
 
+/**
+ * @typedef {import('types/config').PrerenderErrorHandler} PrerenderErrorHandler
+ * @typedef {import('types/config').PrerenderOnErrorValue} OnError
+ * @typedef {import('types/internal').Logger} Logger
+ */
+
 /** @type {(errorDetails: Parameters<PrerenderErrorHandler>[0] ) => string} */
 function errorDetailsToString({ status, path, referrer, referenceType }) {
 	return `${status} ${path}${referrer ? ` (${referenceType} from ${referrer})` : ''}`;
@@ -357,36 +493,8 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 			});
 
 			if (is_html && config.kit.prerender.crawl) {
-				const cleaned = clean_html(/** @type {string} */ (rendered.body));
-
-				let match;
-				const pattern = /<(a|img|link|source)\s+([\s\S]+?)>/gm;
-
-				const hrefs = [];
-
-				while ((match = pattern.exec(cleaned))) {
-					const element = match[1];
-					const attrs = match[2];
-
-					if (element === 'a' || element === 'link') {
-						if (is_rel_external(attrs)) continue;
-
-						let href = get_href(attrs);
-						if (!href) continue;
-
-						const i = href.indexOf('#');
-						href = i < 0 ? href : href.substring(0, i);
-						hrefs.push(href);
-					} else {
-						if (element === 'img') {
-							hrefs.push(get_src(attrs));
-						}
-						hrefs.push(...get_srcset_urls(attrs));
-					}
-				}
-
-				for (const href of hrefs) {
-					if (!href) continue;
+				for (const href of crawl(/** @type {string} */ (rendered.body))) {
+					if (href.startsWith('data:')) continue;
 
 					const resolved = resolve$1(path, href);
 					if (!is_root_relative(resolved)) continue;

package/dist/cli.js

@@ -479,6 +479,21 @@ const options = object(
 
 			hydrate: boolean(true),
 
+			methodOverride: object({
+				parameter: string('_method'),
+				allowed: validate([], (input, keypath) => {
+					if (!Array.isArray(input) || !input.every((method) => typeof method === 'string')) {
+						throw new Error(`${keypath} must be an array of strings`);
+					}
+
+					if (input.map((i) => i.toUpperCase()).includes('GET')) {
+						throw new Error(`${keypath} cannot contain "GET"`);
+					}
+
+					return input;
+				})
+			}),
+
 			package: object({
 				dir: string('package'),
 				// excludes all .d.ts and filename starting with _
@@ -575,7 +590,14 @@ const options = object(
 				files: fun((filename) => !/\.DS_STORE/.test(filename))
 			}),
 
-			ssr: boolean(true),
+			// TODO remove this for 1.0
+			ssr: validate(null, (input) => {
+				if (input !== undefined) {
+					throw new Error(
+						'config.kit.ssr has been removed — use the handle hook instead: https://kit.svelte.dev/docs#hooks-handle'
+					);
+				}
+			}),
 
 			target: string(null),
 
@@ -846,7 +868,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.220');
+const prog = sade('svelte-kit').version('1.0.0-next.224');
 
 prog
 	.command('dev')
@@ -998,7 +1020,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.220'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.224'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';