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

package/assets/runtime/internal/start.js

@@ -373,6 +373,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);
 }
 
@@ -512,7 +520,7 @@ class Renderer {
 		const branch = [];
 
 		/** @type {Record<string, any>} */
-		let context = {};
+		let stuff = {};
 
 		/** @type {import('./types').NavigationResult | undefined} */
 		let result;
@@ -526,7 +534,7 @@ class Renderer {
 				const node = await this._load_node({
 					module: await nodes[i],
 					page,
-					context,
+					stuff,
 					status: is_leaf ? status : undefined,
 					error: is_leaf ? error : undefined
 				});
@@ -542,10 +550,10 @@ class Renderer {
 							path: page.path,
 							query: page.query
 						};
-					} else if (node.loaded.context) {
-						context = {
-							...context,
-							...node.loaded.context
+					} else if (node.loaded.stuff) {
+						stuff = {
+							...stuff,
+							...node.loaded.stuff
 						};
 					}
 				}
@@ -824,11 +832,11 @@ class Renderer {
 	 *   error?: Error;
 	 *   module: CSRComponent;
 	 *   page: import('types/page').Page;
-	 *   context: Record<string, any>;
+	 *   stuff: Record<string, any>;
 	 * }} options
 	 * @returns
 	 */
-	async _load_node({ status, error, module, page, context }) {
+	async _load_node({ status, error, module, page, stuff }) {
 		/** @type {import('./types').BranchNode} */
 		const node = {
 			module,
@@ -837,11 +845,11 @@ class Renderer {
 				path: false,
 				query: false,
 				session: false,
-				context: false,
+				stuff: false,
 				dependencies: []
 			},
 			loaded: null,
-			context
+			stuff
 		};
 
 		/** @type {Record<string, string>} */
@@ -879,9 +887,9 @@ class Renderer {
 					node.uses.session = true;
 					return session;
 				},
-				get context() {
-					node.uses.context = true;
-					return { ...context };
+				get stuff() {
+					node.uses.stuff = true;
+					return { ...stuff };
 				},
 				fetch(resource, info) {
 					const url = typeof resource === 'string' ? resource : resource.url;
@@ -903,7 +911,7 @@ class Renderer {
 			if (!loaded) return;
 
 			node.loaded = normalize(loaded);
-			if (node.loaded.context) node.context = node.loaded.context;
+			if (node.loaded.stuff) node.stuff = node.loaded.stuff;
 		}
 
 		return node;
@@ -942,8 +950,8 @@ class Renderer {
 		let branch = [];
 
 		/** @type {Record<string, any>} */
-		let context = {};
-		let context_changed = false;
+		let stuff = {};
+		let stuff_changed = false;
 
 		/** @type {number | undefined} */
 		let status = 200;
@@ -972,13 +980,13 @@ class Renderer {
 					(changed.query && previous.uses.query) ||
 					(changed.session && previous.uses.session) ||
 					previous.uses.dependencies.some((dep) => this.invalid.has(dep)) ||
-					(context_changed && previous.uses.context);
+					(stuff_changed && previous.uses.stuff);
 
 				if (changed_since_last_render) {
 					node = await this._load_node({
 						module,
 						page,
-						context
+						stuff
 					});
 
 					const is_leaf = i === a.length - 1;
@@ -997,8 +1005,8 @@ class Renderer {
 							};
 						}
 
-						if (node.loaded.context) {
-							context_changed = true;
+						if (node.loaded.stuff) {
+							stuff_changed = true;
 						}
 					} else if (is_leaf && module.load) {
 						// if the leaf node has a `load` function
@@ -1031,7 +1039,7 @@ class Renderer {
 								error,
 								module: await b[i](),
 								page,
-								context: node_loaded.context
+								stuff: node_loaded.stuff
 							});
 
 							if (error_loaded && error_loaded.loaded && error_loaded.loaded.error) {
@@ -1053,10 +1061,10 @@ class Renderer {
 					query
 				});
 			} else {
-				if (node && node.loaded && node.loaded.context) {
-					context = {
-						...context,
-						...node.loaded.context
+				if (node && node.loaded && node.loaded.stuff) {
+					stuff = {
+						...stuff,
+						...node.loaded.stuff
 					};
 				}
 
@@ -1086,7 +1094,7 @@ class Renderer {
 		const node = await this._load_node({
 			module: await this.fallback[0],
 			page,
-			context: {}
+			stuff: {}
 		});
 
 		const branch = [
@@ -1096,7 +1104,7 @@ class Renderer {
 				error,
 				module: await this.fallback[1],
 				page,
-				context: (node && node.loaded && node.loaded.context) || {}
+				stuff: (node && node.loaded && node.loaded.stuff) || {}
 			})
 		];