@sveltejs/kit 1.0.0-next.289 → 1.0.0-next.291

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

@@ -2,10 +2,10 @@ 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, g as generate_tsconfig, d as deep_merge } from './tsconfig.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 { 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;
 
@@ -238,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({
@@ -405,7 +416,7 @@ 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);
 
@@ -418,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')
 						])
@@ -442,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: [

package/dist/chunks/index2.js

@@ -1,6 +1,6 @@
 import fs__default from 'fs';
 import path__default from 'path';
-import { p as print_config_conflicts, b as SVELTE_KIT, d as copy_assets, f as posixify, e as get_aliases, a as resolve_entry, l as load_template, r as runtime, m as mkdirp, h as rimraf } from '../cli.js';
+import { e as print_config_conflicts, b as copy_assets, p as posixify, d as get_aliases, r as resolve_entry, g as get_runtime_path, l as load_template, m as mkdirp, f as rimraf } from '../cli.js';
 import { d as deep_merge, a as create_app, g as generate_tsconfig, c as create_manifest_data } from './tsconfig.js';
 import { g as generate_manifest } from './index3.js';
 import vite from 'vite';
@@ -39,7 +39,7 @@ async function build_service_worker(
 		}
 	}
 
-	const service_worker = `${cwd}/${SVELTE_KIT}/generated/service-worker.js`;
+	const service_worker = `${config.kit.outDir}/generated/service-worker.js`;
 
 	fs__default.writeFileSync(
 		service_worker,
@@ -167,7 +167,7 @@ async function build_client({
 		cwd
 	});
 
-	copy_assets(`${SVELTE_KIT}/runtime`);
+	copy_assets(path__default.join(config.kit.outDir, 'runtime'));
 
 	process.env.VITE_SVELTEKIT_AMP = config.kit.amp ? 'true' : '';
 
@@ -264,11 +264,12 @@ async function build_client({
  *   hooks: string;
  *   config: import('types').ValidatedConfig;
  *   has_service_worker: boolean;
+ *   runtime: string;
  *   template: string;
  * }} opts
  * @returns
  */
-const server_template = ({ config, hooks, has_service_worker, template }) => `
+const server_template = ({ config, hooks, has_service_worker, runtime, template }) => `
 import root from '__GENERATED__/root.svelte';
 import { respond } from '${runtime}/server/index.js';
 import { set_paths, assets, base } from '${runtime}/paths.js';
@@ -383,7 +384,7 @@ async function build_server(
 ) {
 	let hooks_file = resolve_entry(config.kit.files.hooks);
 	if (!hooks_file || !fs__default.existsSync(hooks_file)) {
-		hooks_file = path__default.resolve(cwd, `${SVELTE_KIT}/build/hooks.js`);
+		hooks_file = path__default.join(config.kit.outDir, 'build/hooks.js');
 		fs__default.writeFileSync(hooks_file, '');
 	}
 
@@ -427,6 +428,7 @@ async function build_server(
 			config,
 			hooks: app_relative(hooks_file),
 			has_service_worker: service_worker_register && !!service_worker_entry_file,
+			runtime: get_runtime_path(config),
 			template: load_template(cwd, config)
 		})
 	);
@@ -590,11 +592,11 @@ function get_methods(cwd, output, manifest_data) {
 async function build(config) {
 	const cwd = process.cwd(); // TODO is this necessary?
 
-	const build_dir = path__default.resolve(`${SVELTE_KIT}/build`);
+	const build_dir = path__default.join(config.kit.outDir, 'build');
 	rimraf(build_dir);
 	mkdirp(build_dir);
 
-	const output_dir = path__default.resolve(`${SVELTE_KIT}/output`);
+	const output_dir = path__default.join(config.kit.outDir, 'output');
 	rimraf(output_dir);
 	mkdirp(output_dir);
 
@@ -614,7 +616,7 @@ async function build(config) {
 			cwd
 		}),
 		output_dir,
-		client_entry_file: path__default.relative(cwd, `${runtime}/client/start.js`),
+		client_entry_file: path__default.relative(cwd, `${get_runtime_path(config)}/client/start.js`),
 		service_worker_entry_file: resolve_entry(config.kit.files.serviceWorker),
 		service_worker_register: config.kit.serviceWorker.register
 	};

package/dist/chunks/index3.js

@@ -1,5 +1,5 @@
 import { s } from './misc.js';
-import { g as get_mime_lookup } from '../cli.js';
+import { a as get_mime_lookup } from '../cli.js';
 
 /**
  * @param {import('types').BuildData} build_data;

package/dist/chunks/index4.js

@@ -1,6 +1,6 @@
-import { b as SVELTE_KIT, m as mkdirp, h as rimraf, i as copy, $, j as logger } from '../cli.js';
+import { m as mkdirp, f as rimraf, h as copy, $, i as logger } from '../cli.js';
 import { readFileSync, writeFileSync } from 'fs';
-import { resolve as resolve$1, join, dirname } from 'path';
+import { join, dirname } from 'path';
 import { pathToFileURL, URL } from 'url';
 import { installFetch } from '../install-fetch.js';
 import { g as generate_manifest } from './index3.js';
@@ -450,7 +450,6 @@ const REDIRECT = 3;
 
 /**
  * @param {{
- *   cwd: string;
  *   out: string;
  *   log: Logger;
  *   config: import('types').ValidatedConfig;
@@ -459,7 +458,7 @@ const REDIRECT = 3;
  *   all: boolean; // disregard `export const prerender = true`
  * }} opts
  */
-async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
+async function prerender({ out, log, config, build_data, fallback, all }) {
 	/** @type {import('types').Prerendered} */
 	const prerendered = {
 		pages: new Map(),
@@ -474,7 +473,7 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 	installFetch();
 
-	const server_root = resolve$1(cwd, `${SVELTE_KIT}/output`);
+	const server_root = join(config.kit.outDir, 'output');
 
 	/** @type {import('types').ServerModule} */
 	const { Server, override } = await import(pathToFileURL(`${server_root}/server/index.js`).href);
@@ -707,14 +706,13 @@ async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
 
 /**
  * @param {{
- *   cwd: string;
  *   config: import('types').ValidatedConfig;
  *   build_data: import('types').BuildData;
  *   log: import('types').Logger;
  * }} opts
  * @returns {import('types').Builder}
  */
-function create_builder({ cwd, config, build_data, log }) {
+function create_builder({ config, build_data, log }) {
 	/** @type {Set<string>} */
 	let prerendered_paths;
 
@@ -820,15 +818,15 @@ function create_builder({ cwd, config, build_data, log }) {
 		},
 
 		getBuildDirectory(name) {
-			return `${cwd}/${SVELTE_KIT}/${name}`;
+			return `${config.kit.outDir}/${name}`;
 		},
 
 		getClientDirectory() {
-			return `${cwd}/${SVELTE_KIT}/output/client`;
+			return `${config.kit.outDir}/output/client`;
 		},
 
 		getServerDirectory() {
-			return `${cwd}/${SVELTE_KIT}/output/server`;
+			return `${config.kit.outDir}/output/server`;
 		},
 
 		getStaticDirectory() {
@@ -836,13 +834,13 @@ function create_builder({ cwd, config, build_data, log }) {
 		},
 
 		writeClient(dest) {
-			return copy(`${cwd}/${SVELTE_KIT}/output/client`, dest, {
+			return copy(`${config.kit.outDir}/output/client`, dest, {
 				filter: (file) => file[0] !== '.'
 			});
 		},
 
 		writeServer(dest) {
-			return copy(`${cwd}/${SVELTE_KIT}/output/server`, dest, {
+			return copy(`${config.kit.outDir}/output/server`, dest, {
 				filter: (file) => file[0] !== '.'
 			});
 		},
@@ -861,7 +859,6 @@ function create_builder({ cwd, config, build_data, log }) {
 			const prerendered = await prerender({
 				out: dest,
 				all,
-				cwd,
 				config,
 				build_data,
 				fallback,
@@ -878,15 +875,15 @@ function create_builder({ cwd, config, build_data, log }) {
 /**
  * @param {import('types').ValidatedConfig} config
  * @param {import('types').BuildData} build_data
- * @param {{ cwd?: string, verbose: boolean }} opts
+ * @param {{ verbose: boolean }} opts
  */
-async function adapt(config, build_data, { cwd = process.cwd(), verbose }) {
+async function adapt(config, build_data, { verbose }) {
 	const { name, adapt } = config.kit.adapter;
 
 	console.log($.bold().cyan(`\n> Using ${name}`));
 
 	const log = logger({ verbose });
-	const builder = create_builder({ cwd, config, build_data, log });
+	const builder = create_builder({ config, build_data, log });
 	await adapt(builder);
 
 	log.success('done');

package/dist/chunks/index5.js

@@ -1,12 +1,11 @@
 import fs__default from 'fs';
 import http from 'http';
 import https from 'https';
-import { resolve, join } from 'path';
-import { s as sirv } from './build.js';
+import { join } from 'path';
+import { s as sirv, S as SVELTE_KIT_ASSETS } from './constants.js';
 import { pathToFileURL } from 'url';
 import { getRequest, setResponse } from '../node.js';
 import { installFetch } from '../install-fetch.js';
-import { b as SVELTE_KIT, S as SVELTE_KIT_ASSETS } from '../cli.js';
 import 'querystring';
 import 'stream';
 import 'node:http';
@@ -16,9 +15,6 @@ import 'node:stream';
 import 'node:util';
 import 'node:url';
 import 'net';
-import 'sade';
-import 'child_process';
-import 'os';
 
 /** @param {string} dir */
 const mutable = (dir) =>
@@ -36,17 +32,11 @@ const mutable = (dir) =>
  *   cwd?: string;
  * }} opts
  */
-async function preview({
-	port,
-	host,
-	config,
-	https: use_https = false,
-	cwd = process.cwd()
-}) {
+async function preview({ port, host, config, https: use_https = false }) {
 	installFetch();
 
-	const index_file = resolve(cwd, `${SVELTE_KIT}/output/server/index.js`);
-	const manifest_file = resolve(cwd, `${SVELTE_KIT}/output/server/manifest.js`);
+	const index_file = join(config.kit.outDir, 'output/server/index.js');
+	const manifest_file = join(config.kit.outDir, 'output/server/manifest.js');
 
 	/** @type {import('types').ServerModule} */
 	const { Server, override } = await import(pathToFileURL(index_file).href);
@@ -61,7 +51,7 @@ async function preview({
 				return next();
 		  };
 
-	const assets_handler = sirv(resolve(cwd, `${SVELTE_KIT}/output/client`), {
+	const assets_handler = sirv(join(config.kit.outDir, 'output/client'), {
 		maxAge: 31536000,
 		immutable: true
 	});

package/dist/chunks/index6.js

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { createRequire } from 'module';
-import { h as rimraf, m as mkdirp, w as walk$1, $ } from '../cli.js';
+import { f as rimraf, m as mkdirp, w as walk$1, $ } from '../cli.js';
 import 'sade';
 import 'child_process';
 import 'net';

package/dist/chunks/tsconfig.js

@@ -1,7 +1,7 @@
 import fs__default from 'fs';
 import path__default from 'path';
 import { s } from './misc.js';
-import { m as mkdirp, b as SVELTE_KIT, r as runtime, f as posixify, $ } from '../cli.js';
+import { m as mkdirp, g as get_runtime_path, p as posixify, $ } from '../cli.js';
 
 /**
  * Takes zero or more objects and returns a new object that has all the values
@@ -110,7 +110,7 @@ function write_if_changed(file, code) {
  * }} options
  */
 function create_app({ config, manifest_data, cwd = process.cwd() }) {
-	const output = `${SVELTE_KIT}/generated`;
+	const output = path__default.join(config.kit.outDir, 'generated');
 	const base = path__default.relative(cwd, output);
 
 	write_if_changed(`${output}/manifest.js`, generate_client_manifest(manifest_data, base));
@@ -329,7 +329,7 @@ function create_types(config, manifest_data) {
 			.filter(Boolean)
 			.join(', ');
 
-		const file = `${SVELTE_KIT}/types/${key || 'index'}.d.ts`;
+		const file = `${config.kit.outDir}/types/${key || 'index'}.d.ts`;
 		const content = [
 			'// this file is auto-generated',
 			`import type { ${imports} } from '@sveltejs/kit';`,
@@ -480,7 +480,7 @@ const specials = new Set(['__layout', '__layout.reset', '__error']);
  */
 function create_manifest_data({
 	config,
-	fallback = `${runtime}/components`,
+	fallback = `${get_runtime_path(config)}/components`,
 	cwd = process.cwd()
 }) {
 	/**
@@ -910,18 +910,18 @@ const exists = (file) => fs__default.existsSync(file) && file;
 
 /** @param {import('types').ValidatedConfig} config */
 function generate_tsconfig(config) {
-	const out = path__default.resolve(SVELTE_KIT, 'tsconfig.json');
+	const out = path__default.join(config.kit.outDir, 'tsconfig.json');
 	const user_file = exists('tsconfig.json') || exists('jsconfig.json');
 
 	if (user_file) validate(config, out, user_file);
 
-	mkdirp(SVELTE_KIT);
+	mkdirp(config.kit.outDir);
 
 	/** @param {string} file */
 	const project_relative = (file) => posixify(path__default.relative('.', file));
 
 	/** @param {string} file */
-	const config_relative = (file) => posixify(path__default.relative(SVELTE_KIT, file));
+	const config_relative = (file) => posixify(path__default.relative(config.kit.outDir, file));
 
 	const dirs = new Set([
 		project_relative(path__default.dirname(config.kit.files.routes)),
@@ -937,7 +937,7 @@ function generate_tsconfig(config) {
 	});
 
 	fs__default.writeFileSync(
-		`${SVELTE_KIT}/tsconfig.json`,
+		out,
 		JSON.stringify(
 			{
 				compilerOptions: {
@@ -1018,7 +1018,7 @@ function validate(config, out, user_file) {
 		}
 	} else {
 		let relative = posixify(path__default.relative('.', out));
-		if (relative.startsWith(SVELTE_KIT)) relative = './' + relative;
+		if (!relative.startsWith('./')) relative = './' + relative;
 
 		console.warn(
 			$

package/dist/cli.js

@@ -320,17 +320,11 @@ function posixify(str) {
 	return str.replace(/\\/g, '/');
 }
 
-const SVELTE_KIT = '.svelte-kit';
-
-// 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';
-
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path__default.dirname(__filename);
 
-const runtime = posixify_path(path__default.resolve(`${SVELTE_KIT}/runtime`))
+const get_runtime_path = /** @param {import('types').ValidatedConfig} config */ (config) =>
+			posixify_path(path__default.join(config.kit.outDir, 'runtime'))
 	;
 
 /** @param {string} str */
@@ -425,8 +419,8 @@ function get_mime_lookup(manifest_data) {
 /** @param {import('types').ValidatedConfig} config */
 function get_aliases(config) {
 	const alias = {
-		__GENERATED__: path__default.posix.resolve(`${SVELTE_KIT}/generated`),
-		$app: `${runtime}/app`,
+		__GENERATED__: path__default.posix.join(config.kit.outDir, 'generated'),
+		$app: `${get_runtime_path(config)}/app`,
 		$lib: config.kit.files.lib
 	};
 
@@ -575,6 +569,8 @@ const options = object(
 				})
 			}),
 
+			outDir: string('.svelte-kit'),
+
 			package: object({
 				dir: string('package'),
 				// excludes all .d.ts and filename starting with _
@@ -915,6 +911,8 @@ async function load_config({ cwd = process.cwd() } = {}) {
 
 	const validated = validate_config(config.default);
 
+	validated.kit.outDir = path__default.resolve(cwd, validated.kit.outDir);
+
 	validated.kit.files.assets = path__default.resolve(cwd, validated.kit.files.assets);
 	validated.kit.files.hooks = path__default.resolve(cwd, validated.kit.files.hooks);
 	validated.kit.files.lib = path__default.resolve(cwd, validated.kit.files.lib);
@@ -998,7 +996,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.289');
+const prog = sade('svelte-kit').version('1.0.0-next.291');
 
 prog
 	.command('dev')
@@ -1156,7 +1154,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.289'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.291'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -1193,4 +1191,4 @@ function welcome({ port, host, https, open, loose, allow, cwd }) {
 	console.log('\n');
 }
 
-export { $, SVELTE_KIT_ASSETS as S, resolve_entry as a, SVELTE_KIT as b, coalesce_to_error as c, copy_assets as d, get_aliases as e, posixify as f, get_mime_lookup as g, rimraf as h, copy as i, logger as j, load_template as l, mkdirp as m, print_config_conflicts as p, runtime as r, walk as w };
+export { $, get_mime_lookup as a, copy_assets as b, coalesce_to_error as c, get_aliases as d, print_config_conflicts as e, rimraf as f, get_runtime_path as g, copy as h, logger as i, load_template as l, mkdirp as m, posixify as p, resolve_entry as r, walk as w };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.289",
+  "version": "1.0.0-next.291",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/index.d.ts

@@ -55,6 +55,7 @@ export interface Config {
 			parameter?: string;
 			allowed?: string[];
 		};
+		outDir?: string;
 		package?: {
 			dir?: string;
 			emitTypes?: boolean;
@@ -115,8 +116,14 @@ export interface HandleError {
  *
  * Note that you can use [generated types](/docs/types#generated-types) instead of manually specifying the Params generic argument.
  */
-export interface Load<Params = Record<string, string>, Props = Record<string, any>> {
-	(input: LoadInput<Params>): MaybePromise<Either<Fallthrough, LoadOutput<Props>>>;
+export interface Load<
+	Params extends Record<string, string> = Record<string, string>,
+	InputProps extends Record<string, any> = Record<string, any>,
+	OutputProps extends Record<string, any> = InputProps
+> {
+	(input: LoadInput<Params, InputProps>): MaybePromise<
+		Either<Fallthrough, LoadOutput<OutputProps>>
+	>;
 }
 
 export interface Navigation {

package/types/private.d.ts

@@ -220,10 +220,10 @@ export type JSONValue =
 	| JSONValue[]
 	| JSONObject;
 
-export interface LoadInput<Params = Record<string, string>> {
+export interface LoadInput<Params = Record<string, string>, Props = Record<string, any>> {
 	url: URL;
 	params: Params;
-	props: Record<string, any>;
+	props: Props;
 	fetch(info: RequestInfo, init?: RequestInit): Promise<Response>;
 	session: App.Session;
 	stuff: Partial<App.Stuff>;

package/assets/chunks/utils.js

@@ -1,13 +0,0 @@
-/** @param {HTMLDocument} doc */
-function get_base_uri(doc) {
-	let baseURI = doc.baseURI;
-
-	if (!baseURI) {
-		const baseTags = doc.getElementsByTagName('base');
-		baseURI = baseTags.length ? baseTags[0].href : doc.URL;
-	}
-
-	return baseURI;
-}
-
-export { get_base_uri as g };