@sveltejs/kit 1.0.0-next.338 → 1.0.0-next.339

package/assets/client/start.js

@@ -962,11 +962,44 @@ function create_client({ target, session, base, trailing_slash }) {
 					node.uses.stuff = true;
 					return { ...stuff };
 				},
-				fetch(resource, info) {
-					const requested = typeof resource === 'string' ? resource : resource.url;
-					add_dependency(requested);
+				async fetch(resource, init) {
+					let requested;
+
+					if (typeof resource === 'string') {
+						requested = resource;
+					} else {
+						requested = resource.url;
+
+						// we're not allowed to modify the received `Request` object, so in order
+						// to fixup relative urls we create a new equivalent `init` object instead
+						init = {
+							// the request body must be consumed in memory until browsers
+							// implement streaming request bodies and/or the body getter
+							body:
+								resource.method === 'GET' || resource.method === 'HEAD'
+									? undefined
+									: await resource.blob(),
+							cache: resource.cache,
+							credentials: resource.credentials,
+							headers: resource.headers,
+							integrity: resource.integrity,
+							keepalive: resource.keepalive,
+							method: resource.method,
+							mode: resource.mode,
+							redirect: resource.redirect,
+							referrer: resource.referrer,
+							referrerPolicy: resource.referrerPolicy,
+							signal: resource.signal,
+							...init
+						};
+					}
+
+					// we must fixup relative urls so they are resolved from the target page
+					const normalized = new URL(requested, url).href;
+					add_dependency(normalized);
 
-					return started ? fetch$1(resource, info) : initial_fetch(resource, info);
+					// prerendered pages may be served from any origin, so `initial_fetch` urls shouldn't be normalized
+					return started ? fetch$1(normalized, init) : initial_fetch(requested, init);
 				},
 				status: status ?? null,
 				error: error ?? null

package/assets/server/index.js

@@ -1130,7 +1130,7 @@ async function render_response({
 		}
 
 		if (options.template_contains_nonce) {
-			throw new Error('Cannot use prerendering if page template contains %svelte.nonce%');
+			throw new Error('Cannot use prerendering if page template contains %sveltekit.nonce%');
 		}
 	}
 

package/dist/chunks/index.js

@@ -335,14 +335,14 @@ async function create_plugin(config, cwd) {
 								template: ({ head, body, assets, nonce }) => {
 									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)
+											.replace(/%sveltekit\.assets%/g, assets)
+											.replace(/%sveltekit\.nonce%/g, nonce)
+											// head and body must be replaced last, in case someone tries to sneak in %sveltekit.assets% etc
+											.replace('%sveltekit.head%', () => head)
+											.replace('%sveltekit.body%', () => body)
 									);
 								},
-								template_contains_nonce: template.includes('%svelte.nonce%'),
+								template_contains_nonce: template.includes('%sveltekit.nonce%'),
 								trailing_slash: config.kit.trailingSlash
 							},
 							{

package/dist/chunks/index2.js

@@ -342,10 +342,10 @@ import { set_paths, assets, base } from '${runtime}/paths.js';
 import { set_prerendering } from '${runtime}/env.js';
 
 const template = ({ head, body, assets, nonce }) => ${s(template)
-	.replace('%svelte.head%', '" + head + "')
-	.replace('%svelte.body%', '" + body + "')
-	.replace(/%svelte\.assets%/g, '" + assets + "')
-	.replace(/%svelte\.nonce%/g, '" + nonce + "')};
+	.replace('%sveltekit.head%', '" + head + "')
+	.replace('%sveltekit.body%', '" + body + "')
+	.replace(/%sveltekit\.assets%/g, '" + assets + "')
+	.replace(/%sveltekit\.nonce%/g, '" + nonce + "')};
 
 let read = null;
 
@@ -394,7 +394,7 @@ export class Server {
 			service_worker: ${has_service_worker ? "base + '/service-worker.js'" : 'null'},
 			router: ${s(config.kit.browser.router)},
 			template,
-			template_contains_nonce: ${template.includes('%svelte.nonce%')},
+			template_contains_nonce: ${template.includes('%sveltekit.nonce%')},
 			trailing_slash: ${s(config.kit.trailingSlash)}
 		};
 	}

package/dist/chunks/index6.js

@@ -5950,14 +5950,14 @@ const flatten_properties = (array, target) => {
  * @param {any[]} nodes
  * @param {any[]} target
  */
-const flatten = (nodes, target) => {
+const flatten$1 = (nodes, target) => {
 	for (let i = 0; i < nodes.length; i += 1) {
 		const node = nodes[i];
 
 		if (node === EMPTY) continue;
 
 		if (Array.isArray(node)) {
-			flatten(node, target);
+			flatten$1(node, target);
 			continue;
 		}
 
@@ -6076,7 +6076,7 @@ const inject = (raw, node, values, comments) => {
 			}
 
 			if (node.type === 'ArrayExpression' || node.type === 'ArrayPattern') {
-				node.elements = flatten(node.elements, []);
+				node.elements = flatten$1(node.elements, []);
 			}
 
 			if (
@@ -6084,18 +6084,18 @@ const inject = (raw, node, values, comments) => {
 				node.type === 'FunctionDeclaration' ||
 				node.type === 'ArrowFunctionExpression'
 			) {
-				node.params = flatten(node.params, []);
+				node.params = flatten$1(node.params, []);
 			}
 
 			if (node.type === 'CallExpression' || node.type === 'NewExpression') {
-				node.arguments = flatten(node.arguments, []);
+				node.arguments = flatten$1(node.arguments, []);
 			}
 
 			if (
 				node.type === 'ImportDeclaration' ||
 				node.type === 'ExportNamedDeclaration'
 			) {
-				node.specifiers = flatten(node.specifiers, []);
+				node.specifiers = flatten$1(node.specifiers, []);
 			}
 
 			if (node.type === 'ForStatement') {
@@ -13813,7 +13813,7 @@ const meta_tags = new Map([
     ['svelte:window', 'Window'],
     ['svelte:body', 'Body']
 ]);
-Array.from(meta_tags.keys()).concat('svelte:self', 'svelte:component', 'svelte:fragment');
+Array.from(meta_tags.keys()).concat('svelte:self', 'svelte:component', 'svelte:fragment', 'svelte:element');
 
 function getLocator(source, options) {
     if (options === void 0) { options = {}; }
@@ -13850,6 +13850,19 @@ function getLocator(source, options) {
     return locate;
 }
 
+/**
+ * Pushes all `items` into `array` using `push`, therefore mutating the array.
+ * We do this for memory and perf reasons, and because `array.push(...items)` would
+ * run into a "max call stack size exceeded" error with too many items (~65k).
+ * @param array
+ * @param items
+ */
+function push_array$1(array, items) {
+    for (let i = 0; i < items.length; i++) {
+        array.push(items[i]);
+    }
+}
+
 x `true`;
 x `false`;
 
@@ -14744,13 +14757,6 @@ function merge_tables(this_table, other_table) {
     }
     return [new_table, idx_map, val_changed, idx_changed];
 }
-function pushArray(_this, other) {
-    // We use push to mutate in place for memory and perf reasons
-    // We use the for loop instead of _this.push(...other) to avoid the JS engine's function argument limit (65,535 in JavascriptCore)
-    for (let i = 0; i < other.length; i++) {
-        _this.push(other[i]);
-    }
-}
 class MappedCode {
     constructor(string = '', map = null) {
         this.string = string;
@@ -14838,9 +14844,9 @@ class MappedCode {
             }
         }
         // combine last line + first line
-        pushArray(m1.mappings[m1.mappings.length - 1], m2.mappings.shift());
+        push_array$1(m1.mappings[m1.mappings.length - 1], m2.mappings.shift());
         // append other lines
-        pushArray(m1.mappings, m2.mappings);
+        push_array$1(m1.mappings, m2.mappings);
         return this;
     }
     static from_processed(string, map) {

package/dist/chunks/sync.js

@@ -193,118 +193,120 @@ function create_manifest_data({
 	const routes_base = posixify(path__default.relative(cwd, config.kit.files.routes));
 	const valid_extensions = [...config.extensions, ...config.kit.endpointExtensions];
 
-	list_files(config.kit.files.routes).forEach((file) => {
-		const extension = valid_extensions.find((ext) => file.endsWith(ext));
-		if (!extension) return;
+	if (fs__default.existsSync(config.kit.files.routes)) {
+		list_files(config.kit.files.routes).forEach((file) => {
+			const extension = valid_extensions.find((ext) => file.endsWith(ext));
+			if (!extension) return;
 
-		const id = file
-			.slice(0, -extension.length)
-			.replace(/(?:^|\/)index((?:@[a-zA-Z0-9_-]+)?(?:\.[a-z]+)?)?$/, '$1');
-		const project_relative = `${routes_base}/${file}`;
+			const id = file
+				.slice(0, -extension.length)
+				.replace(/(?:^|\/)index((?:@[a-zA-Z0-9_-]+)?(?:\.[a-z]+)?)?$/, '$1');
+			const project_relative = `${routes_base}/${file}`;
 
-		const segments = id.split('/');
-		const name = /** @type {string} */ (segments.pop());
+			const segments = id.split('/');
+			const name = /** @type {string} */ (segments.pop());
 
-		if (name === '__layout.reset') {
-			throw new Error(
-				'__layout.reset has been removed in favour of named layouts: https://kit.svelte.dev/docs/layouts#named-layouts'
-			);
-		}
+			if (name === '__layout.reset') {
+				throw new Error(
+					'__layout.reset has been removed in favour of named layouts: https://kit.svelte.dev/docs/layouts#named-layouts'
+				);
+			}
 
-		if (name === '__error' || layout_pattern.test(name)) {
-			const dir = segments.join('/');
+			if (name === '__error' || layout_pattern.test(name)) {
+				const dir = segments.join('/');
 
-			if (!tree.has(dir)) {
-				tree.set(dir, {
-					error: undefined,
-					layouts: {}
-				});
-			}
+				if (!tree.has(dir)) {
+					tree.set(dir, {
+						error: undefined,
+						layouts: {}
+					});
+				}
 
-			const group = /** @type {Node} */ (tree.get(dir));
+				const group = /** @type {Node} */ (tree.get(dir));
 
-			if (name === '__error') {
-				group.error = project_relative;
-			} else {
-				const match = /** @type {RegExpMatchArray} */ (layout_pattern.exec(name));
+				if (name === '__error') {
+					group.error = project_relative;
+				} else {
+					const match = /** @type {RegExpMatchArray} */ (layout_pattern.exec(name));
 
-				if (match[1] === DEFAULT) {
-					throw new Error(`${project_relative} cannot use reserved "${DEFAULT}" name`);
-				}
+					if (match[1] === DEFAULT) {
+						throw new Error(`${project_relative} cannot use reserved "${DEFAULT}" name`);
+					}
+
+					const layout_id = match[1] || DEFAULT;
 
-				const layout_id = match[1] || DEFAULT;
+					const defined = group.layouts[layout_id];
+					if (defined && defined !== default_layout) {
+						throw new Error(
+							`Duplicate layout ${project_relative} already defined at ${defined.file}`
+						);
+					}
 
-				const defined = group.layouts[layout_id];
-				if (defined && defined !== default_layout) {
-					throw new Error(
-						`Duplicate layout ${project_relative} already defined at ${defined.file}`
-					);
+					group.layouts[layout_id] = {
+						file: project_relative,
+						name
+					};
 				}
 
-				group.layouts[layout_id] = {
-					file: project_relative,
-					name
-				};
+				return;
+			} else if (dunder_pattern.test(file)) {
+				throw new Error(
+					`Files and directories prefixed with __ are reserved (saw ${project_relative})`
+				);
 			}
 
-			return;
-		} else if (dunder_pattern.test(file)) {
-			throw new Error(
-				`Files and directories prefixed with __ are reserved (saw ${project_relative})`
-			);
-		}
+			if (!config.kit.routes(file)) return;
 
-		if (!config.kit.routes(file)) return;
-
-		if (/\]\[/.test(id)) {
-			throw new Error(`Invalid route ${project_relative} — parameters must be separated`);
-		}
+			if (/\]\[/.test(id)) {
+				throw new Error(`Invalid route ${project_relative} — parameters must be separated`);
+			}
 
-		if (count_occurrences('[', id) !== count_occurrences(']', id)) {
-			throw new Error(`Invalid route ${project_relative} — brackets are unbalanced`);
-		}
+			if (count_occurrences('[', id) !== count_occurrences(']', id)) {
+				throw new Error(`Invalid route ${project_relative} — brackets are unbalanced`);
+			}
 
-		if (!units.has(id)) {
-			units.set(id, {
-				id,
-				pattern: parse_route_id(id).pattern,
-				segments: id
-					.split('/')
-					.filter(Boolean)
-					.map((segment) => {
-						/** @type {Part[]} */
-						const parts = [];
-						segment.split(/\[(.+?)\]/).map((content, i) => {
-							const dynamic = !!(i % 2);
-
-							if (!content) return;
-
-							parts.push({
-								content,
-								dynamic,
-								rest: dynamic && content.startsWith('...'),
-								type: (dynamic && content.split('=')[1]) || null
+			if (!units.has(id)) {
+				units.set(id, {
+					id,
+					pattern: parse_route_id(id).pattern,
+					segments: id
+						.split('/')
+						.filter(Boolean)
+						.map((segment) => {
+							/** @type {Part[]} */
+							const parts = [];
+							segment.split(/\[(.+?)\]/).map((content, i) => {
+								const dynamic = !!(i % 2);
+
+								if (!content) return;
+
+								parts.push({
+									content,
+									dynamic,
+									rest: dynamic && content.startsWith('...'),
+									type: (dynamic && content.split('=')[1]) || null
+								});
 							});
-						});
-						return parts;
-					}),
-				page: undefined,
-				endpoint: undefined
-			});
-		}
+							return parts;
+						}),
+					page: undefined,
+					endpoint: undefined
+				});
+			}
 
-		const unit = /** @type {Unit} */ (units.get(id));
+			const unit = /** @type {Unit} */ (units.get(id));
 
-		if (config.extensions.find((ext) => file.endsWith(ext))) {
-			const { layouts, errors } = trace(project_relative, file, tree, config.extensions);
-			unit.page = {
-				a: layouts.concat(project_relative),
-				b: errors
-			};
-		} else {
-			unit.endpoint = project_relative;
-		}
-	});
+			if (config.extensions.find((ext) => file.endsWith(ext))) {
+				const { layouts, errors } = trace(project_relative, file, tree, config.extensions);
+				unit.page = {
+					a: layouts.concat(project_relative),
+					b: errors
+				};
+			} else {
+				unit.endpoint = project_relative;
+			}
+		});
+	}
 
 	/** @type {string[]} */
 	const components = [];

package/dist/cli.js

@@ -765,7 +765,16 @@ function load_template(cwd, config) {
 
 	if (fs__default.existsSync(template)) {
 		const contents = fs__default.readFileSync(template, 'utf8');
-		const expected_tags = ['%svelte.head%', '%svelte.body%'];
+
+		// TODO remove this for 1.0
+		const match = /%svelte\.([a-z]+)%/.exec(contents);
+		if (match) {
+			throw new Error(
+				`%svelte.${match[1]}% in ${relative} should be replaced with %sveltekit.${match[1]}%`
+			);
+		}
+
+		const expected_tags = ['%sveltekit.head%', '%sveltekit.body%'];
 		expected_tags.forEach((tag) => {
 			if (contents.indexOf(tag) === -1) {
 				throw new Error(`${relative} is missing ${tag}`);
@@ -875,7 +884,7 @@ async function launch(port, https, base) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}${base}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.338');
+const prog = sade('svelte-kit').version('1.0.0-next.339');
 
 prog
 	.command('dev')
@@ -1097,7 +1106,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	if (open) launch(port, https, base);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.338'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.339'}\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.338",
+  "version": "1.0.0-next.339",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -16,36 +16,21 @@
     "vite": "^2.9.9"
   },
   "devDependencies": {
-    "@playwright/test": "^1.21.0",
-    "@rollup/plugin-replace": "^4.0.0",
     "@types/connect": "^3.4.35",
     "@types/cookie": "^0.5.0",
     "@types/marked": "^4.0.1",
     "@types/mime": "^2.0.3",
-    "@types/node": "^16.11.11",
     "@types/sade": "^1.7.3",
     "@types/set-cookie-parser": "^2.4.2",
     "cookie": "^0.5.0",
-    "cross-env": "^7.0.3",
     "devalue": "^2.0.1",
-    "eslint": "^8.3.0",
     "kleur": "^4.1.4",
     "locate-character": "^2.0.5",
-    "marked": "^4.0.5",
     "mime": "^3.0.0",
     "node-fetch": "^3.1.0",
-    "port-authority": "^1.1.2",
-    "rollup": "^2.60.2",
     "selfsigned": "^2.0.0",
     "set-cookie-parser": "^2.4.8",
-    "sirv": "^2.0.0",
-    "svelte": "^3.44.2",
-    "svelte-check": "^2.5.0",
-    "svelte-preprocess": "^4.9.8",
-    "svelte2tsx": "~0.5.0",
-    "tiny-glob": "^0.2.9",
-    "typescript": "^4.6.4",
-    "uvu": "^0.5.2"
+    "svelte": "^3.48.0"
   },
   "peerDependencies": {
     "svelte": "^3.44.0"