@sveltejs/kit 1.0.0-next.302 → 1.0.0-next.305

package/assets/client/start.js

@@ -563,7 +563,11 @@ function create_client({ target, session, base, trailing_slash }) {
 		const current_token = (token = {});
 		let navigation_result = intent && (await load_route(intent, no_cache));
 
-		if (!navigation_result && url.pathname === location.pathname) {
+		if (
+			!navigation_result &&
+			url.origin === location.origin &&
+			url.pathname === location.pathname
+		) {
 			// this could happen in SPA fallback mode if the user navigated to
 			// `/non-existent-page`. if we fall back to reloading the page, it
 			// will create an infinite loop. so whereas we normally handle

package/dist/chunks/index.js

@@ -73,7 +73,7 @@ async function create_plugin(config, cwd) {
 								const url = id.startsWith('..') ? `/@fs${path__default.posix.resolve(id)}` : `/${id}`;
 
 								const module = /** @type {import('types').SSRComponent} */ (
-									await vite.ssrLoadModule(url)
+									await vite.ssrLoadModule(url, { fixStacktrace: false })
 								);
 								const node = await vite.moduleGraph.getModuleByUrl(url);
 
@@ -95,7 +95,7 @@ async function create_plugin(config, cwd) {
 										(query.has('svelte') && query.get('type') === 'style')
 									) {
 										try {
-											const mod = await vite.ssrLoadModule(dep.url);
+											const mod = await vite.ssrLoadModule(dep.url, { fixStacktrace: false });
 											styles[dep.url] = mod.default;
 										} catch {
 											// this can happen with dynamically imported modules, I think
@@ -128,7 +128,7 @@ async function create_plugin(config, cwd) {
 									shadow: route.shadow
 										? async () => {
 												const url = path__default.resolve(cwd, /** @type {string} */ (route.shadow));
-												return await vite.ssrLoadModule(url);
+												return await vite.ssrLoadModule(url, { fixStacktrace: false });
 										  }
 										: null,
 									a: route.a.map((id) => manifest_data.components.indexOf(id)),
@@ -144,7 +144,7 @@ async function create_plugin(config, cwd) {
 								types,
 								load: async () => {
 									const url = path__default.resolve(cwd, route.file);
-									return await vite.ssrLoadModule(url);
+									return await vite.ssrLoadModule(url, { fixStacktrace: false });
 								}
 							};
 						}),
@@ -155,7 +155,7 @@ async function create_plugin(config, cwd) {
 							for (const key in manifest_data.matchers) {
 								const file = manifest_data.matchers[key];
 								const url = path__default.resolve(cwd, file);
-								const module = await vite.ssrLoadModule(url);
+								const module = await vite.ssrLoadModule(url, { fixStacktrace: false });
 
 								if (module.match) {
 									matchers[key] = module.match;
@@ -172,20 +172,7 @@ async function create_plugin(config, cwd) {
 
 			/** @param {Error} error */
 			function fix_stack_trace(error) {
-				// TODO https://github.com/vitejs/vite/issues/7045
-
-				// ideally vite would expose ssrRewriteStacktrace, but
-				// in lieu of that, we can implement it ourselves. we
-				// don't want to mutate the error object, because
-				// the stack trace could be 'fixed' multiple times,
-				// and Vite will fix stack traces before we even
-				// see them if they occur during ssrLoadModule
-				const original = error.stack;
-				vite.ssrFixStacktrace(error);
-				const fixed = error.stack;
-				error.stack = original;
-
-				return fixed;
+				return error.stack ? vite.ssrRewriteStacktrace(error.stack) : error.stack;
 			}
 
 			update_manifest();
@@ -231,7 +218,7 @@ async function create_plugin(config, cwd) {
 
 						/** @type {Partial<import('types').Hooks>} */
 						const user_hooks = resolve_entry(config.kit.files.hooks)
-							? await vite.ssrLoadModule(`/${config.kit.files.hooks}`)
+							? await vite.ssrLoadModule(`/${config.kit.files.hooks}`, { fixStacktrace: false })
 							: {};
 
 						const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
@@ -271,13 +258,15 @@ async function create_plugin(config, cwd) {
 						// can get loaded twice via different URLs, which causes failures. Might
 						// require changes to Vite to fix
 						const { default: root } = await vite.ssrLoadModule(
-							`/${posixify(path__default.relative(cwd, `${config.kit.outDir}/generated/root.svelte`))}`
+							`/${posixify(path__default.relative(cwd, `${config.kit.outDir}/generated/root.svelte`))}`,
+							{ fixStacktrace: false }
 						);
 
 						const paths = await vite.ssrLoadModule(
 							true
 								? `/${posixify(path__default.relative(cwd, `${config.kit.outDir}/runtime/paths.js`))}`
-								: `/@fs${runtime}/paths.js`
+								: `/@fs${runtime}/paths.js`,
+							{ fixStacktrace: false }
 						);
 
 						paths.set_paths({

package/dist/chunks/index2.js

@@ -1003,10 +1003,6 @@ async function prerender({ config, entries, files, log }) {
 		paths: []
 	};
 
-	if (!config.kit.prerender.enabled) {
-		return prerendered;
-	}
-
 	installFetch();
 
 	const server_root = join(config.kit.outDir, 'output');
@@ -1023,6 +1019,23 @@ async function prerender({ config, entries, files, log }) {
 
 	const server = new Server(manifest);
 
+	const rendered = await server.respond(new Request('http://sveltekit-prerender/[fallback]'), {
+		getClientAddress,
+		prerender: {
+			fallback: true,
+			default: false,
+			dependencies: new Map()
+		}
+	});
+
+	const file = `${config.kit.outDir}/output/prerendered/fallback.html`;
+	mkdirp(dirname(file));
+	writeFileSync(file, await rendered.text());
+
+	if (!config.kit.prerender.enabled) {
+		return prerendered;
+	}
+
 	const error = normalise_error_handler(log, config.kit.prerender.onError);
 
 	const q = queue(config.kit.prerender.concurrency);
@@ -1214,19 +1227,6 @@ async function prerender({ config, entries, files, log }) {
 		await q.done();
 	}
 
-	const rendered = await server.respond(new Request('http://sveltekit-prerender/[fallback]'), {
-		getClientAddress,
-		prerender: {
-			fallback: true,
-			default: false,
-			dependencies: new Map()
-		}
-	});
-
-	const file = `${config.kit.outDir}/output/prerendered/fallback.html`;
-	mkdirp(dirname(file));
-	writeFileSync(file, await rendered.text());
-
 	return prerendered;
 }
 

package/dist/chunks/sync.js

@@ -132,7 +132,7 @@ var mime = new Mime(standard, other);
  * }} Item
  */
 
-const specials = new Set(['__layout', '__layout.reset', '__error']);
+const specials = new Set(['__layout', '__layout.reset', '__error', '__tests__', '__test__']);
 
 /**
  * @param {{
@@ -833,21 +833,6 @@ function write_types(config, manifest_data) {
 	/** @type {Map<string, { params: string[], type: 'page' | 'endpoint' | 'both' }>} */
 	const shadow_types = new Map();
 
-	/** @param {string} key */
-	function extract_params(key) {
-		/** @type {string[]} */
-		const params = [];
-
-		const pattern = /\[(?:\.{3})?([^\]]+)\]/g;
-		let match;
-
-		while ((match = pattern.exec(key))) {
-			params.push(match[1]);
-		}
-
-		return params;
-	}
-
 	manifest_data.routes.forEach((route) => {
 		const file = route.type === 'endpoint' ? route.file : route.shadow;
 
@@ -857,7 +842,7 @@ function write_types(config, manifest_data) {
 			);
 			const key = file.slice(0, -ext.length);
 			shadow_types.set(key, {
-				params: extract_params(key),
+				params: parse_route_id(key).names,
 				type: route.type === 'endpoint' ? 'endpoint' : 'both'
 			});
 		}
@@ -870,7 +855,7 @@ function write_types(config, manifest_data) {
 		const key = component.slice(0, -ext.length);
 
 		if (!shadow_types.has(key)) {
-			shadow_types.set(key, { params: extract_params(key), type: 'page' });
+			shadow_types.set(key, { params: parse_route_id(key).names, type: 'page' });
 		}
 	});
 

package/dist/cli.js

@@ -869,7 +869,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.302');
+const prog = sade('svelte-kit').version('1.0.0-next.305');
 
 prog
 	.command('dev')
@@ -1047,7 +1047,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.302'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.305'}\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.302",
+  "version": "1.0.0-next.305",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -12,7 +12,7 @@
   "dependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.32",
     "sade": "^1.7.4",
-    "vite": "^2.8.0"
+    "vite": "^2.9.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.19.1",

package/types/index.d.ts

@@ -184,7 +184,7 @@ export interface HandleError {
 }
 
 /**
- * The type of a `load` function exported from `<script context="module">` in a page or layout.
+ * The `(input: LoadInput) => LoadOutput` `load` function exported from `<script context="module">` in a page or layout.
  *
  * Note that you can use [generated types](/docs/types#generated-types) instead of manually specifying the Params generic argument.
  */
@@ -215,13 +215,9 @@ export interface ParamMatcher {
 }
 
 /**
- * A function exported from an endpoint that corresponds to an
- * HTTP verb (`get`, `put`, `patch`, etc) and handles requests with
- * that method. Note that since 'delete' is a reserved word in
- * JavaScript, delete handles are called `del` instead.
+ * A `(event: RequestEvent) => RequestHandlerOutput` function exported from an endpoint that corresponds to an HTTP verb (`get`, `put`, `patch`, etc) and handles requests with that method. Note that since 'delete' is a reserved word in JavaScript, delete handles are called `del` instead.
  *
- * Note that you can use [generated types](/docs/types#generated-types)
- * instead of manually specifying the `Params` generic argument.
+ * Note that you can use [generated types](/docs/types#generated-types) instead of manually specifying the `Params` generic argument.
  */
 export interface RequestHandler<
 	Params extends Record<string, string> = Record<string, string>,

package/types/internal.d.ts

@@ -18,7 +18,6 @@ import {
 	RequestOptions,
 	ResolveOptions,
 	ResponseHeaders,
-	RouteSegment,
 	TrailingSlash
 } from './private';
 

package/types/private.d.ts

@@ -2,8 +2,6 @@
 // but which cannot be imported from `@sveltejs/kit`. Care should
 // be taken to avoid breaking changes when editing this file
 
-import { ValidatedConfig } from './internal';
-
 export interface AdapterEntry {
 	/**
 	 * A string that uniquely identifies an HTTP service (e.g. serverless function) and is used for deduplication.
@@ -191,8 +189,6 @@ export interface Logger {
 
 export type MaybePromise<T> = T | Promise<T>;
 
-export type Only<T, U> = { [P in keyof T]: T[P] } & { [P in Exclude<keyof U, keyof T>]?: never };
-
 export interface Prerendered {
 	pages: Map<
 		string,