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

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.288');
+const prog = sade('svelte-kit').version('1.0.0-next.290');
 
 prog
 	.command('dev')
@@ -1050,7 +1048,7 @@ prog
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 			const config = await load_config();
 
-			const { build } = await import('./chunks/index3.js');
+			const { build } = await import('./chunks/index2.js');
 			const build_data = await build(config);
 
 			console.log(
@@ -1058,7 +1056,7 @@ prog
 			);
 
 			if (config.kit.adapter) {
-				const { adapt } = await import('./chunks/index5.js');
+				const { adapt } = await import('./chunks/index4.js');
 				await adapt(config, build_data, { verbose });
 
 				// this is necessary to close any open db connections, etc
@@ -1093,7 +1091,7 @@ prog
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 			const config = await load_config();
 
-			const { preview } = await import('./chunks/index6.js');
+			const { preview } = await import('./chunks/index5.js');
 
 			await preview({ port, host, config, https });
 
@@ -1111,7 +1109,7 @@ prog
 		try {
 			const config = await load_config();
 
-			const { make_package } = await import('./chunks/index7.js');
+			const { make_package } = await import('./chunks/index6.js');
 
 			await make_package(config);
 		} catch (error) {
@@ -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.288'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.290'}\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.288",
+  "version": "1.0.0-next.290",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -79,7 +79,15 @@
     "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types",
     "dev": "rollup -cw",
     "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format",
-    "check": "tsc && svelte-check --ignore test/prerendering,src/packaging/test",
+    "check": "tsc && npm run check:integration && npm run check:prerendering",
+    "check:integration": "npm run check:integration:amp && npm run check:integration:basics && npm run check:integration:options && npm run check:integration:options-2",
+    "check:integration:amp": "cd test/apps/amp && pnpm check",
+    "check:integration:basics": "cd test/apps/basics && pnpm check",
+    "check:integration:options": "cd test/apps/options && pnpm check",
+    "check:integration:options-2": "cd test/apps/options-2 && pnpm check",
+    "check:prerendering": "npm run check:prerendering:basics && npm run check:prerendering:options",
+    "check:prerendering:basics": "cd test/prerendering/basics && pnpm check",
+    "check:prerendering:options": "cd test/prerendering/options && pnpm check",
     "format": "npm run check-format -- --write",
     "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
     "test": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:prerendering && npm run test:integration",

package/types/index.d.ts

@@ -55,6 +55,7 @@ export interface Config {
 			parameter?: string;
 			allowed?: string[];
 		};
+		outDir?: string;
 		package?: {
 			dir?: string;
 			emitTypes?: boolean;
@@ -110,8 +111,24 @@ export interface HandleError {
 	(input: { error: Error & { frame?: string }; event: RequestEvent }): void;
 }
 
-export interface Load<Params = Record<string, string>, Props = Record<string, any>> {
-	(input: LoadInput<Params>): MaybePromise<Either<Fallthrough, LoadOutput<Props>>>;
+/**
+ * The type of a `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.
+ */
+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 {
+	from: URL;
+	to: URL;
 }
 
 export interface Page<Params extends Record<string, string> = Record<string, string>> {
@@ -122,16 +139,14 @@ export interface Page<Params extends Record<string, string> = Record<string, str
 	error: Error | null;
 }
 
-export interface Navigation {
-	from: URL;
-	to: URL;
-}
-
 /**
  * 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.
+ *
+ * Note that you can use [generated types](/docs/types#generated)
+ * instead of manually specifying the `Params` generic argument.
  */
 export interface RequestHandler<Params = Record<string, string>, Output extends Body = Body> {
 	(event: RequestEvent<Params>): RequestHandlerOutput<Output>;

package/types/internal.d.ts

@@ -1,12 +1,12 @@
 import { OutputAsset, OutputChunk } from 'rollup';
 import {
-	RequestHandler,
-	Load,
+	Config,
 	ExternalFetch,
 	GetSession,
 	Handle,
 	HandleError,
-	Config
+	Load,
+	RequestHandler
 } from './index';
 import {
 	Either,
@@ -139,6 +139,10 @@ export interface PageData {
 	b: string[];
 }
 
+export type PayloadScriptAttributes =
+	| { type: 'data'; url: string; body?: string }
+	| { type: 'props' };
+
 export interface PrerenderDependency {
 	response: Response;
 	body: null | string | Uint8Array;

package/types/private.d.ts

@@ -126,7 +126,7 @@ export namespace Csp {
 	type UriPath = `${HttpDelineator}${string}`;
 }
 
-export type CspDirectives = {
+export interface CspDirectives {
 	'child-src'?: Csp.Sources;
 	'default-src'?: Array<Csp.Source | Csp.ActionSource>;
 	'frame-src'?: Csp.Sources;
@@ -191,7 +191,7 @@ export type CspDirectives = {
 		| 'unsafe-url'
 		| 'none'
 	>;
-};
+}
 
 export type Either<T, U> = Only<T, U> | Only<U, T>;
 
@@ -206,7 +206,9 @@ export interface Fallthrough {
 
 export type HttpMethod = 'get' | 'head' | 'post' | 'put' | 'delete' | 'patch';
 
-export type JSONObject = { [key: string]: JSONValue };
+export interface JSONObject {
+	[key: string]: JSONValue;
+}
 
 export type JSONValue =
 	| string
@@ -218,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>;
@@ -249,12 +251,6 @@ 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 type PayloadScriptAttributes = PayloadScriptAttributesData | PayloadScriptAttributesProps;
-
-type PayloadScriptAttributesData = { type: 'data'; url: string; body?: string };
-
-type PayloadScriptAttributesProps = { type: 'props' };
-
 export interface Prerendered {
 	pages: Map<
 		string,
@@ -304,10 +300,10 @@ export interface RequestOptions {
 	platform?: App.Platform;
 }
 
-export type ResolveOptions = {
+export interface ResolveOptions {
 	ssr?: boolean;
 	transformPage?: ({ html }: { html: string }) => MaybePromise<string>;
-};
+}
 
 /** `string[]` is only for set-cookie, everything else must be type of `string` */
 export type ResponseHeaders = Record<string, string | number | string[]>;
@@ -346,6 +342,8 @@ export interface SSRManifest {
 	};
 }
 
-export type ToJSON = { toJSON(...args: any[]): Exclude<JSONValue, ToJSON> };
+export interface ToJSON {
+	toJSON(...args: any[]): Exclude<JSONValue, ToJSON>;
+}
 
 export type TrailingSlash = 'never' | 'always' | 'ignore';