@sveltejs/kit 1.0.0-next.288 → 1.0.0-next.290

package/assets/client/start.js

@@ -76,7 +76,7 @@ class Router {
 	 *    base: string;
 	 *    routes: import('types').CSRRoute[];
 	 *    trailing_slash: import('types').TrailingSlash;
-	 *    renderer: import('./renderer').Renderer
+	 *    renderer: import('./renderer').Renderer;
 	 * }} opts
 	 */
 	constructor({ base, routes, trailing_slash, renderer }) {
@@ -310,8 +310,7 @@ class Router {
 				id: url.pathname + url.search,
 				routes: this.routes.filter(([pattern]) => pattern.test(path)),
 				url,
-				path,
-				initial: !this.initialized
+				path
 			};
 		}
 	}
@@ -876,6 +875,14 @@ class Renderer {
 		const token = (this.token = {});
 		let navigation_result = await this._get_navigation_result(info, no_cache);
 
+		if (!navigation_result && info.url.pathname === location.pathname) {
+			navigation_result = await this._load_error({
+				status: 404,
+				error: new Error(`Not found: ${info.url.pathname}`),
+				url: info.url
+			});
+		}
+
 		if (!navigation_result) {
 			location.href = info.url.href;
 			return;
@@ -1083,14 +1090,6 @@ class Renderer {
 			);
 			if (result) return result;
 		}
-
-		if (info.initial) {
-			return await this._load_error({
-				status: 404,
-				error: new Error(`Not found: ${info.url.pathname}`),
-				url: info.url
-			});
-		}
 	}
 
 	/**

package/assets/server/index.js

@@ -2543,7 +2543,6 @@ async function respond(request, options, state = {}) {
 		request,
 		url,
 		params: {},
-		// @ts-expect-error this picks up types that belong to the tests
 		locals: {},
 		platform: state.platform
 	};

package/dist/chunks/amp_hook.js

@@ -1,5 +1,5 @@
 /** @type {import('amphtml-validator').Validator} */
-const amp = await (await import('./index8.js').then(function (n) { return n.i; })).getInstance();
+const amp = await (await import('./index7.js').then(function (n) { return n.i; })).getInstance();
 
 /** @type {import('types').Handle} */
 async function handle({ event, resolve }) {

package/dist/chunks/{build.js → constants.js}

@@ -655,4 +655,9 @@ function sirv (dir, opts={}) {
 	};
 }
 
-export { sirv as s };
+// in `svelte-kit dev` and `svelte-kit preview`, we use a fake
+// asset path so that we can serve local assets while still
+// verifying that requests are correctly prefixed
+const SVELTE_KIT_ASSETS = '/_svelte_kit_assets';
+
+export { SVELTE_KIT_ASSETS as S, sirv as s };

package/dist/chunks/index.js

@@ -1,11 +1,11 @@
 import path__default from 'path';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import vite from 'vite';
-import { c as create_manifest_data, a as create_app, d as deep_merge } from './index2.js';
-import { r as runtime, S as SVELTE_KIT_ASSETS, a as resolve_entry, $, b as SVELTE_KIT, l as load_template, c as coalesce_to_error, g as get_mime_lookup, d as copy_assets, e as get_aliases, p as print_config_conflicts } from '../cli.js';
+import { c as create_manifest_data, a as create_app, g as generate_tsconfig, d as deep_merge } from './tsconfig.js';
+import { g as get_runtime_path, r as resolve_entry, $, p as posixify, l as load_template, c as coalesce_to_error, a as get_mime_lookup, b as copy_assets, d as get_aliases, e as print_config_conflicts } from '../cli.js';
 import fs__default from 'fs';
 import { URL } from 'url';
-import { s as sirv } from './build.js';
+import { S as SVELTE_KIT_ASSETS, s as sirv } from './constants.js';
 import { installFetch } from '../install-fetch.js';
 import { getRequest, setResponse } from '../node.js';
 import { sequence } from '../hooks.js';
@@ -29,6 +29,8 @@ import 'stream';
  * @returns {Promise<import('vite').Plugin>}
  */
 async function create_plugin(config, cwd) {
+	const runtime = get_runtime_path(config);
+
 	/** @type {import('types').Handle} */
 	let amp;
 
@@ -54,7 +56,7 @@ async function create_plugin(config, cwd) {
 			function update_manifest() {
 				const manifest_data = create_manifest_data({ config, cwd });
 
-				create_app({ manifest_data, output: `${SVELTE_KIT}/generated`, cwd });
+				create_app({ config, manifest_data, cwd });
 
 				manifest = {
 					appDir: config.kit.appDir,
@@ -210,7 +212,6 @@ async function create_plugin(config, cwd) {
 
 						/** @type {import('types').Hooks} */
 						const hooks = {
-							// @ts-expect-error this picks up types that belong to the tests
 							getSession: user_hooks.getSession || (() => ({})),
 							handle: amp ? sequence(amp, handle) : handle,
 							handleError:
@@ -239,9 +240,18 @@ async function create_plugin(config, cwd) {
 							throw new Error('The serverFetch hook has been renamed to externalFetch.');
 						}
 
-						const root = (await vite.ssrLoadModule(`/${SVELTE_KIT}/generated/root.svelte`)).default;
+						// TODO the / prefix will probably fail if outDir is outside the cwd (which
+						// could be the case in a monorepo setup), but without it these modules
+						// 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`))}`
+						);
+
 						const paths = await vite.ssrLoadModule(
-							true ? `/${SVELTE_KIT}/runtime/paths.js` : `/@fs${runtime}/paths.js`
+							true
+								? `/${posixify(path__default.relative(cwd, `${config.kit.outDir}/runtime/paths.js`))}`
+								: `/@fs${runtime}/paths.js`
 						);
 
 						paths.set_paths({
@@ -406,7 +416,9 @@ function find_deps(node, deps) {
 
 /** @param {Options} opts */
 async function dev({ cwd, port, host, https, config }) {
-	copy_assets(`${SVELTE_KIT}/runtime`);
+	copy_assets(path__default.join(config.kit.outDir, 'runtime'));
+
+	generate_tsconfig(config);
 
 	const [vite_config] = deep_merge(
 		{
@@ -417,8 +429,8 @@ async function dev({ cwd, port, host, https, config }) {
 							config.kit.files.assets,
 							config.kit.files.lib,
 							config.kit.files.routes,
+							config.kit.outDir,
 							path__default.resolve(cwd, 'src'),
-							path__default.resolve(cwd, SVELTE_KIT),
 							path__default.resolve(cwd, 'node_modules'),
 							path__default.resolve(vite.searchForWorkspaceRoot(cwd), 'node_modules')
 						])
@@ -441,7 +453,7 @@ async function dev({ cwd, port, host, https, config }) {
 			rollupOptions: {
 				// Vite dependency crawler needs an explicit JS entry point
 				// eventhough server otherwise works without it
-				input: `${runtime}/client/start.js`
+				input: `${get_runtime_path(config)}/client/start.js`
 			}
 		},
 		plugins: [