@sveltejs/kit 1.0.0-next.170 → 1.0.0-next.174

package/dist/cli.js

@@ -426,14 +426,9 @@ const options = object(
 
 			package: object({
 				dir: string('package'),
-				exports: object({
-					include: array_of_strings(['**']),
-					exclude: array_of_strings(['**/_*'])
-				}),
-				files: object({
-					include: array_of_strings(['**']),
-					exclude: array_of_strings([])
-				}),
+				// excludes all .d.ts and filename starting with _
+				exports: fun((filepath) => !/^_|\/_|\.d\.ts$/.test(filepath)),
+				files: fun(() => true),
 				emitTypes: boolean(true)
 			}),
 
@@ -518,7 +513,7 @@ const options = object(
 			router: boolean(true),
 
 			serviceWorker: object({
-				exclude: array_of_strings([])
+				files: fun((filename) => !/\.DS_STORE/.test(filename))
 			}),
 
 			ssr: boolean(true),
@@ -617,19 +612,6 @@ function string(fallback, allow_empty = true) {
 	});
 }
 
-/**
- * @param {string[]} array
- * @returns {Validator}
- */
-function array_of_strings(array) {
-	return validate(array, (input, keypath) => {
-		if (!Array.isArray(input) || !input.every((glob) => typeof glob === 'string')) {
-			throw new Error(`${keypath} must be an array of strings`);
-		}
-		return input;
-	});
-}
-
 /**
  * @param {boolean} fallback
  * @returns {Validator}
@@ -661,6 +643,19 @@ function list(options, fallback = options[0]) {
 	});
 }
 
+/**
+ * @param {(filename: string) => boolean} fallback
+ * @returns {Validator}
+ */
+function fun(fallback) {
+	return validate(fallback, (input, keypath) => {
+		if (typeof input !== 'function') {
+			throw new Error(`${keypath} should be a function, if specified`);
+		}
+		return input;
+	});
+}
+
 /**
  * @param {string} input
  * @param {string} keypath
@@ -822,7 +817,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.170');
+const prog = sade('svelte-kit').version('1.0.0-next.174');
 
 prog
 	.command('dev')
@@ -965,7 +960,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.170'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.174'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = host !== 'localhost' && host !== '127.0.0.1';

package/dist/ssr.js

@@ -675,6 +675,14 @@ function normalize(loaded) {
 		}
 	}
 
+	// TODO remove before 1.0
+	if (/** @type {any} */ (loaded).context) {
+		throw new Error(
+			'You are returning "context" from a load function. ' +
+				'"context" was renamed to "stuff", please adjust your code accordingly.'
+		);
+	}
+
 	return /** @type {import('types/internal').NormalizedLoadOutput} */ (loaded);
 }
 
@@ -689,7 +697,7 @@ const s = JSON.stringify;
  *   page: import('types/page').Page;
  *   node: import('types/internal').SSRNode;
  *   $session: any;
- *   context: Record<string, any>;
+ *   stuff: Record<string, any>;
  *   prerender_enabled: boolean;
  *   is_leaf: boolean;
  *   is_error: boolean;
@@ -706,7 +714,7 @@ async function load_node({
 	page,
 	node,
 	$session,
-	context,
+	stuff,
 	prerender_enabled,
 	is_leaf,
 	is_error,
@@ -946,7 +954,7 @@ async function load_node({
 					})
 				);
 			},
-			context: { ...context }
+			stuff: { ...stuff }
 		};
 
 		if (is_error) {
@@ -970,7 +978,7 @@ async function load_node({
 	return {
 		node,
 		loaded: normalize(loaded),
-		context: loaded.context || context,
+		stuff: loaded.stuff || stuff,
 		fetched,
 		set_cookie_headers,
 		uses_credentials
@@ -1093,7 +1101,7 @@ async function respond_with_error({ request, options, state, $session, status, e
 			page,
 			node: default_layout,
 			$session,
-			context: {},
+			stuff: {},
 			prerender_enabled: is_prerender_enabled(options, default_error, state),
 			is_leaf: false,
 			is_error: false
@@ -1111,7 +1119,7 @@ async function respond_with_error({ request, options, state, $session, status, e
 				page,
 				node: default_error,
 				$session,
-				context: loaded ? loaded.context : {},
+				stuff: loaded ? loaded.stuff : {},
 				prerender_enabled: is_prerender_enabled(options, default_error, state),
 				is_leaf: false,
 				is_error: true,
@@ -1229,7 +1237,7 @@ async function respond$1(opts) {
 	let set_cookie_headers = [];
 
 	ssr: if (page_config.ssr) {
-		let context = {};
+		let stuff = {};
 
 		for (let i = 0; i < nodes.length; i += 1) {
 			const node = nodes[i];
@@ -1242,7 +1250,7 @@ async function respond$1(opts) {
 					loaded = await load_node({
 						...opts,
 						node,
-						context,
+						stuff,
 						prerender_enabled: is_prerender_enabled(options, node, state),
 						is_leaf: i === nodes.length - 1,
 						is_error: false
@@ -1298,7 +1306,7 @@ async function respond$1(opts) {
 									await load_node({
 										...opts,
 										node: error_node,
-										context: node_loaded.context,
+										stuff: node_loaded.stuff,
 										prerender_enabled: is_prerender_enabled(options, error_node, state),
 										is_leaf: false,
 										is_error: true,
@@ -1341,11 +1349,10 @@ async function respond$1(opts) {
 				}
 			}
 
-			if (loaded && loaded.loaded.context) {
-				// TODO come up with better names for stuff
-				context = {
-					...context,
-					...loaded.loaded.context
+			if (loaded && loaded.loaded.stuff) {
+				stuff = {
+					...stuff,
+					...loaded.loaded.stuff
 				};
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.170",
+  "version": "1.0.0-next.174",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -19,7 +19,6 @@
     "@types/amphtml-validator": "^1.0.1",
     "@types/cookie": "^0.4.1",
     "@types/marked": "^3.0.1",
-    "@types/micromatch": "^4.0.2",
     "@types/mime": "^2.0.3",
     "@types/node": "^16.9.1",
     "@types/rimraf": "^3.0.2",
@@ -31,7 +30,6 @@
     "kleur": "^4.1.4",
     "locate-character": "^2.0.5",
     "marked": "^3.0.4",
-    "micromatch": "^4.0.4",
     "mime": "^2.5.2",
     "node-fetch": "3.0.0-beta.9",
     "port-authority": "^1.1.2",
@@ -39,14 +37,14 @@
     "rollup": "^2.56.3",
     "selfsigned": "^1.10.11",
     "sirv": "^1.0.17",
-    "svelte": "^3.42.6",
+    "svelte": "^3.43.0",
     "svelte-check": "^2.2.6",
     "svelte2tsx": "~0.4.6",
     "tiny-glob": "^0.2.9",
     "uvu": "^0.5.1"
   },
   "peerDependencies": {
-    "svelte": "^3.39.0"
+    "svelte": "^3.43.0"
   },
   "bin": {
     "svelte-kit": "svelte-kit.js"

package/types/config.d.ts

@@ -51,14 +51,8 @@ export interface Config {
 		package?: {
 			dir?: string;
 			emitTypes?: boolean;
-			exports?: {
-				include?: string[];
-				exclude?: string[];
-			};
-			files?: {
-				include?: string[];
-				exclude?: string[];
-			};
+			exports?(filepath: string): boolean;
+			files?(filepath: string): boolean;
 		};
 		paths?: {
 			assets?: string;
@@ -72,7 +66,7 @@ export interface Config {
 		};
 		router?: boolean;
 		serviceWorker?: {
-			exclude?: string[];
+			files?(filepath: string): boolean;
 		};
 		ssr?: boolean;
 		target?: string;

package/types/internal.d.ts

@@ -192,7 +192,7 @@ export interface NormalizedLoadOutput {
 	error?: Error;
 	redirect?: string;
 	props?: Record<string, any> | Promise<Record<string, any>>;
-	context?: Record<string, any>;
+	stuff?: Record<string, any>;
 	maxage?: number;
 }
 

package/types/page.d.ts

@@ -9,41 +9,41 @@ export interface Page<Params extends Record<string, string> = Record<string, str
 
 export interface LoadInput<
 	PageParams extends Rec<string> = Rec<string>,
-	Context extends Rec = Rec,
+	Stuff extends Rec = Rec,
 	Session = any
 > {
 	page: Page<PageParams>;
 	fetch(info: RequestInfo, init?: RequestInit): Promise<Response>;
 	session: Session;
-	context: Context;
+	stuff: Stuff;
 }
 
 export interface ErrorLoadInput<
 	PageParams extends Rec<string> = Rec<string>,
-	Context extends Rec = Rec,
+	Stuff extends Rec = Rec,
 	Session = any
-> extends LoadInput<PageParams, Context, Session> {
+> extends LoadInput<PageParams, Stuff, Session> {
 	status?: number;
 	error?: Error;
 }
 
-export interface LoadOutput<Props extends Rec = Rec, Context extends Rec = Rec> {
+export interface LoadOutput<Props extends Rec = Rec, Stuff extends Rec = Rec> {
 	status?: number;
 	error?: string | Error;
 	redirect?: string;
 	props?: Props;
-	context?: Context;
+	stuff?: Stuff;
 	maxage?: number;
 }
 
 interface LoadInputExtends {
-	context?: Rec;
+	stuff?: Rec;
 	pageParams?: Rec<string>;
 	session?: any;
 }
 
 interface LoadOutputExtends {
-	context?: Rec;
+	stuff?: Rec;
 	props?: Rec;
 }
 
@@ -54,12 +54,12 @@ export interface Load<
 	(
 		input: LoadInput<
 			InferValue<Input, 'pageParams', Rec<string>>,
-			InferValue<Input, 'context', Rec>,
+			InferValue<Input, 'stuff', Rec>,
 			InferValue<Input, 'session', any>
 		>
 	): MaybePromise<void | LoadOutput<
 		InferValue<Output, 'props', Rec>,
-		InferValue<Output, 'context', Rec>
+		InferValue<Output, 'stuff', Rec>
 	>>;
 }
 
@@ -70,8 +70,8 @@ export interface ErrorLoad<
 	(
 		input: ErrorLoadInput<
 			InferValue<Input, 'pageParams', Rec<string>>,
-			InferValue<Input, 'context', Rec>,
+			InferValue<Input, 'stuff', Rec>,
 			InferValue<Input, 'session', any>
 		>
-	): MaybePromise<LoadOutput<InferValue<Output, 'props', Rec>, InferValue<Output, 'context', Rec>>>;
+	): MaybePromise<LoadOutput<InferValue<Output, 'props', Rec>, InferValue<Output, 'stuff', Rec>>>;
 }