@sveltejs/kit 1.0.0-next.199 → 1.0.0-next.201

package/dist/chunks/index.js

@@ -22,7 +22,7 @@ import { S as SVELTE_KIT, a as SVELTE_KIT_ASSETS } from './constants.js';
 import { c as coalesce_to_error } from './error.js';
 import 'sade';
 import 'net';
-import './http.js';
+import './url.js';
 import './standard.js';
 import 'zlib';
 import 'stream';

package/dist/chunks/index4.js

@@ -2,9 +2,9 @@ import { m as mkdirp, r as rimraf, d as copy, $, l as logger } from '../cli.js';
 import { S as SVELTE_KIT } from './constants.js';
 import { readFileSync, writeFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
-import { pathToFileURL, resolve as resolve$1, URL } from 'url';
+import { pathToFileURL, URL } from 'url';
 import { __fetch_polyfill } from '../install-fetch.js';
-import { g as get_single_valued_header } from './http.js';
+import { g as get_single_valued_header, r as resolve$1, i as is_root_relative } from './url.js';
 import 'sade';
 import 'child_process';
 import 'net';
@@ -202,6 +202,11 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 					log.warn(`${rendered.status} ${decoded_path} -> ${location}`);
 					writeFileSync(file, `<meta http-equiv="refresh" content="0;url=${encodeURI(location)}">`);
 					written_files.push(file);
+
+					const resolved = resolve$1(path, location);
+					if (is_root_relative(resolved)) {
+						await visit(resolved, path);
+					}
 				} else {
 					log.warn(`location header missing on redirect received from ${decoded_path}`);
 				}
@@ -275,7 +280,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 					if (!href) continue;
 
 					const resolved = resolve$1(path, href);
-					if (!resolved.startsWith('/') || resolved.startsWith('//')) continue;
+					if (!is_root_relative(resolved)) continue;
 
 					const parsed = new URL(resolved, 'http://localhost');
 					const pathname = decodeURI(parsed.pathname).replace(config.kit.paths.base, '');

package/dist/chunks/url.js

@@ -0,0 +1,62 @@
+/**
+ * @param {Record<string, string | string[]>} headers
+ * @param {string} key
+ * @returns {string | undefined}
+ * @throws {Error}
+ */
+function get_single_valued_header(headers, key) {
+	const value = headers[key];
+	if (Array.isArray(value)) {
+		if (value.length === 0) {
+			return undefined;
+		}
+		if (value.length > 1) {
+			throw new Error(
+				`Multiple headers provided for ${key}. Multiple may be provided only for set-cookie`
+			);
+		}
+		return value[0];
+	}
+	return value;
+}
+
+const absolute = /^([a-z]+:)?\/?\//;
+const scheme = /^[a-z]+:/;
+
+/**
+ * @param {string} base
+ * @param {string} path
+ */
+function resolve(base, path) {
+	if (scheme.test(path)) return path;
+
+	const base_match = absolute.exec(base);
+	const path_match = absolute.exec(path);
+
+	if (!base_match) {
+		throw new Error(`bad base path: "${base}"`);
+	}
+
+	const baseparts = path_match ? [] : base.slice(base_match[0].length).split('/');
+	const pathparts = path_match ? path.slice(path_match[0].length).split('/') : path.split('/');
+
+	baseparts.pop();
+
+	for (let i = 0; i < pathparts.length; i += 1) {
+		const part = pathparts[i];
+		if (part === '.') continue;
+		else if (part === '..') baseparts.pop();
+		else baseparts.push(part);
+	}
+
+	const prefix = (path_match && path_match[0]) || (base_match && base_match[0]) || '';
+
+	return `${prefix}${baseparts.join('/')}`;
+}
+
+/** @param {string} path */
+function is_root_relative(path) {
+	return path[0] === '/' && path[1] !== '/';
+}
+
+export { get_single_valued_header as g, is_root_relative as i, resolve as r };

package/dist/cli.js

@@ -822,7 +822,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.199');
+const prog = sade('svelte-kit').version('1.0.0-next.201');
 
 prog
 	.command('dev')
@@ -987,7 +987,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.199'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.201'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/dist/ssr.js

@@ -1,4 +1,4 @@
-import { g as get_single_valued_header } from './chunks/http.js';
+import { g as get_single_valued_header, r as resolve, i as is_root_relative } from './chunks/url.js';
 import { c as coalesce_to_error } from './chunks/error.js';
 
 /** @param {Record<string, any>} obj */
@@ -900,7 +900,7 @@ async function load_node({
 								`http://${page.host}/${asset.file}`,
 								/** @type {RequestInit} */ (opts)
 						  );
-				} else if (resolved.startsWith('/') && !resolved.startsWith('//')) {
+				} else if (is_root_relative(resolved)) {
 					const relative = resolved;
 
 					const headers = /** @type {import('types/helper').RequestHeaders} */ ({
@@ -1078,37 +1078,6 @@ async function load_node({
 	};
 }
 
-const absolute = /^([a-z]+:)?\/?\//;
-
-/**
- * @param {string} base
- * @param {string} path
- */
-function resolve(base, path) {
-	const base_match = absolute.exec(base);
-	const path_match = absolute.exec(path);
-
-	if (!base_match) {
-		throw new Error(`bad base path: "${base}"`);
-	}
-
-	const baseparts = path_match ? [] : base.slice(base_match[0].length).split('/');
-	const pathparts = path_match ? path.slice(path_match[0].length).split('/') : path.split('/');
-
-	baseparts.pop();
-
-	for (let i = 0; i < pathparts.length; i += 1) {
-		const part = pathparts[i];
-		if (part === '.') continue;
-		else if (part === '..') baseparts.pop();
-		else baseparts.push(part);
-	}
-
-	const prefix = (path_match && path_match[0]) || (base_match && base_match[0]) || '';
-
-	return `${prefix}${baseparts.join('/')}`;
-}
-
 /**
  * @typedef {import('./types.js').Loaded} Loaded
  * @typedef {import('types/internal').SSRNode} SSRNode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.199",
+  "version": "1.0.0-next.201",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -55,6 +55,9 @@
   ],
   "exports": {
     "./package.json": "./package.json",
+    ".": {
+      "types": "./types/index.d.ts"
+    },
     "./ssr": {
       "import": "./dist/ssr.js"
     },
@@ -66,8 +69,7 @@
     },
     "./install-fetch": {
       "import": "./dist/install-fetch.js"
-    },
-    "./types": "./types/index.d.ts"
+    }
   },
   "types": "types/index.d.ts",
   "engines": {

package/dist/chunks/http.js

@@ -1,23 +0,0 @@
-/**
- * @param {Record<string, string | string[]>} headers
- * @param {string} key
- * @returns {string | undefined}
- * @throws {Error}
- */
-function get_single_valued_header(headers, key) {
-	const value = headers[key];
-	if (Array.isArray(value)) {
-		if (value.length === 0) {
-			return undefined;
-		}
-		if (value.length > 1) {
-			throw new Error(
-				`Multiple headers provided for ${key}. Multiple may be provided only for set-cookie`
-			);
-		}
-		return value[0];
-	}
-	return value;
-}
-
-export { get_single_valued_header as g };