@sveltejs/kit 1.0.0-next.237 → 1.0.0-next.238

package/dist/chunks/index.js

@@ -6,8 +6,8 @@ import { c as coalesce_to_error, S as SVELTE_KIT_ASSETS, r as resolve_entry, $,
 import fs__default from 'fs';
 import { URL as URL$1 } from 'url';
 import { t as to_headers, s as sirv } from './http.js';
+import { e as escape_html_attr, r as resolve, i as is_root_relative, a as escape_json_string_in_html } from './url.js';
 import { s } from './misc.js';
-import { r as resolve, i as is_root_relative } from './url.js';
 import { __fetch_polyfill } from '../install-fetch.js';
 import { getRawBody, setResponse } from '../node.js';
 import 'sade';
@@ -463,85 +463,6 @@ function writable(value, start = noop) {
     return { set, update, subscribe };
 }
 
-/** @type {Record<string, string>} */
-const escape_json_string_in_html_dict = {
-	'"': '\\"',
-	'<': '\\u003C',
-	'>': '\\u003E',
-	'/': '\\u002F',
-	'\\': '\\\\',
-	'\b': '\\b',
-	'\f': '\\f',
-	'\n': '\\n',
-	'\r': '\\r',
-	'\t': '\\t',
-	'\0': '\\0',
-	'\u2028': '\\u2028',
-	'\u2029': '\\u2029'
-};
-
-/** @param {string} str */
-function escape_json_string_in_html(str) {
-	return escape(
-		str,
-		escape_json_string_in_html_dict,
-		(code) => `\\u${code.toString(16).toUpperCase()}`
-	);
-}
-
-/** @type {Record<string, string>} */
-const escape_html_attr_dict = {
-	'<': '&lt;',
-	'>': '&gt;',
-	'"': '&quot;'
-};
-
-/**
- * use for escaping string values to be used html attributes on the page
- * e.g.
- * <script data-url="here">
- *
- * @param {string} str
- * @returns string escaped string
- */
-function escape_html_attr(str) {
-	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
-}
-
-/**
- *
- * @param str {string} string to escape
- * @param dict {Record<string, string>} dictionary of character replacements
- * @param unicode_encoder {function(number): string} encoder to use for high unicode characters
- * @returns {string}
- */
-function escape(str, dict, unicode_encoder) {
-	let result = '';
-
-	for (let i = 0; i < str.length; i += 1) {
-		const char = str.charAt(i);
-		const code = char.charCodeAt(0);
-
-		if (char in dict) {
-			result += dict[char];
-		} else if (code >= 0xd800 && code <= 0xdfff) {
-			const next = str.charCodeAt(i + 1);
-
-			// If this is the beginning of a [high, low] surrogate pair,
-			// add the next two characters, otherwise escape
-			if (code <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) {
-				result += char + str[++i];
-			} else {
-				result += unicode_encoder(code);
-			}
-		} else {
-			result += char;
-		}
-	}
-
-	return result;
-}
-
 /** @param {URL} url */
 function create_prerendering_url_proxy(url) {
 	return new Proxy(url, {

package/dist/chunks/index5.js

@@ -3,7 +3,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
 import { pathToFileURL, URL } from 'url';
 import { __fetch_polyfill } from '../install-fetch.js';
-import { r as resolve$1, i as is_root_relative } from './url.js';
+import { e as escape_html_attr, r as resolve$1, i as is_root_relative } from './url.js';
 import { g as generate_manifest } from './index4.js';
 import 'sade';
 import 'child_process';
@@ -441,7 +441,11 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 					mkdirp(dirname(file));
 
 					log.warn(`${rendered.status} ${decoded_path} -> ${location}`);
-					writeFileSync(file, `<meta http-equiv="refresh" content="0;url=${encodeURI(location)}">`);
+
+					writeFileSync(
+						file,
+						`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
+					);
 
 					const resolved = resolve$1(path, location);
 					if (is_root_relative(resolved)) {

package/dist/chunks/url.js

@@ -1,3 +1,82 @@
+/** @type {Record<string, string>} */
+const escape_json_string_in_html_dict = {
+	'"': '\\"',
+	'<': '\\u003C',
+	'>': '\\u003E',
+	'/': '\\u002F',
+	'\\': '\\\\',
+	'\b': '\\b',
+	'\f': '\\f',
+	'\n': '\\n',
+	'\r': '\\r',
+	'\t': '\\t',
+	'\0': '\\0',
+	'\u2028': '\\u2028',
+	'\u2029': '\\u2029'
+};
+
+/** @param {string} str */
+function escape_json_string_in_html(str) {
+	return escape(
+		str,
+		escape_json_string_in_html_dict,
+		(code) => `\\u${code.toString(16).toUpperCase()}`
+	);
+}
+
+/** @type {Record<string, string>} */
+const escape_html_attr_dict = {
+	'<': '&lt;',
+	'>': '&gt;',
+	'"': '&quot;'
+};
+
+/**
+ * use for escaping string values to be used html attributes on the page
+ * e.g.
+ * <script data-url="here">
+ *
+ * @param {string} str
+ * @returns string escaped string
+ */
+function escape_html_attr(str) {
+	return '"' + escape(str, escape_html_attr_dict, (code) => `&#${code};`) + '"';
+}
+
+/**
+ *
+ * @param str {string} string to escape
+ * @param dict {Record<string, string>} dictionary of character replacements
+ * @param unicode_encoder {function(number): string} encoder to use for high unicode characters
+ * @returns {string}
+ */
+function escape(str, dict, unicode_encoder) {
+	let result = '';
+
+	for (let i = 0; i < str.length; i += 1) {
+		const char = str.charAt(i);
+		const code = char.charCodeAt(0);
+
+		if (char in dict) {
+			result += dict[char];
+		} else if (code >= 0xd800 && code <= 0xdfff) {
+			const next = str.charCodeAt(i + 1);
+
+			// If this is the beginning of a [high, low] surrogate pair,
+			// add the next two characters, otherwise escape
+			if (code <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) {
+				result += char + str[++i];
+			} else {
+				result += unicode_encoder(code);
+			}
+		} else {
+			result += char;
+		}
+	}
+
+	return result;
+}
+
 const absolute = /^([a-z]+:)?\/?\//;
 const scheme = /^[a-z]+:/;
 
@@ -37,4 +116,4 @@ function is_root_relative(path) {
 	return path[0] === '/' && path[1] !== '/';
 }
 
-export { is_root_relative as i, resolve as r };
+export { escape_json_string_in_html as a, escape_html_attr as e, is_root_relative as i, resolve as r };

package/dist/cli.js

@@ -933,7 +933,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.237');
+const prog = sade('svelte-kit').version('1.0.0-next.238');
 
 prog
 	.command('dev')
@@ -1085,7 +1085,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.237'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.238'}\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.237",
+  "version": "1.0.0-next.238",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -79,11 +79,13 @@
     "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components",
     "dev": "rollup -cw",
     "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format",
-    "check": "tsc && svelte-check --ignore \"src/packaging/test\"",
+    "check": "tsc && svelte-check --ignore test/prerendering,src/packaging/test",
     "format": "npm run check-format -- --write",
     "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-    "test": "npm run test:unit && npm run test:packaging && npm run test:integration",
+    "test": "npm run test:unit && npm run test:packaging && npm run test:prerendering && npm run test:integration",
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
+    "test:prerendering": "pnpm test:prerendering:basics",
+    "test:prerendering:basics": "cd test/prerendering/basics && pnpm test",
     "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
     "test:integration": "pnpm test:integration:amp && pnpm test:integration:basics && pnpm test:integration:options && pnpm test:integration:options-2",
     "test:integration:amp": "cd test/apps/amp && pnpm test",