Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 46 additions & 42 deletions packages/kit/src/core/create_manifest_data/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,58 +159,62 @@ export default function create_manifest_data({ config, output, cwd = process.cwd
layout_reset ? [layout_reset] : layout_stack.concat(layout),
layout_reset ? [error] : error_stack.concat(error)
);
} else if (item.is_page) {
const id = components.length.toString();
components.push(item.file);

} else {
const alternates = config.kit.alternateRoutes
? config.kit.alternateRoutes(segments)
: [segments];

const a = layout_stack.concat(item.file);
const b = error_stack;

alternates.forEach((segments) => {
const pattern = get_pattern(segments, true);
if (item.is_page) {
const id = components.length.toString();
components.push(item.file);

let i = a.length;
while (i--) {
if (!b[i] && !a[i]) {
b.splice(i, 1);
a.splice(i, 1);
}
}
const a = layout_stack.concat(item.file);
const b = error_stack;

i = b.length;
while (i--) {
if (b[i]) break;
}
alternates.forEach((segments) => {
const pattern = get_pattern(segments, true);

b.splice(i + 1);
let i = a.length;
while (i--) {
if (!b[i] && !a[i]) {
b.splice(i, 1);
a.splice(i, 1);
}
}

const path = segments.every((segment) => segment.length === 1 && !segment[0].dynamic)
? `/${segments.map((segment) => segment[0].content).join('/')}`
: null;
i = b.length;
while (i--) {
if (b[i]) break;
}

routes.push({
id,
type: 'page',
pattern,
params,
path,
a,
b
b.splice(i + 1);

const path = segments.every((segment) => segment.length === 1 && !segment[0].dynamic)
? `/${segments.map((segment) => segment[0].content).join('/')}`
: null;

routes.push({
id,
type: 'page',
pattern,
params,
path,
a,
b
});
});
});
} else {
const pattern = get_pattern(segments, !item.route_suffix);

routes.push({
type: 'endpoint',
pattern,
file: item.file,
params
});
} else {
alternates.forEach((segments) => {
const pattern = get_pattern(segments, !item.route_suffix);

routes.push({
type: 'endpoint',
pattern,
file: item.file,
params
});
});
}
}
});
}
Expand Down