@sveltejs/kit 1.0.0-next.416 → 1.0.0-next.417

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/core/sync/create_manifest_data/index.js +14 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sveltejs/kit",
3
- "version": "1.0.0-next.416",
3
+ "version": "1.0.0-next.417",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/sveltejs/kit",
package/src/core/sync/create_manifest_data/index.js CHANGED
@@ -172,12 +172,22 @@ export default function create_manifest_data({
172
172
  if (item.is_page) {
173
173
  const route = /** @type {import('types').PageData} */ (route_map.get(id));
174
174
 
175
- if (item.kind === 'component') {
176
- route.leaf.component = project_relative;
177
-
178
- const { layouts, errors } = trace(tree, id, item.uses_layout, project_relative);
175
+ // This ensures that layouts and errors are set for pages that have no Svelte file
176
+ // and only redirect or throw an error, but are set to the Svelte file definition if it exists.
177
+ // This ensures the proper error page is used and rendered in the proper layout.
178
+ if (item.kind === 'component' || route.layouts.length === 0) {
179
+ const { layouts, errors } = trace(
180
+ tree,
181
+ id,
182
+ item.kind === 'component' ? item.uses_layout : undefined,
183
+ project_relative
184
+ );
179
185
  route.layouts = layouts;
180
186
  route.errors = errors;
187
+ }
188
+
189
+ if (item.kind === 'component') {
190
+ route.leaf.component = project_relative;
181
191
  } else if (item.kind === 'server') {
182
192
  route.leaf.server = project_relative;
183
193
  } else {