Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add Route Groups [WIP] #13148

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Add Route Groups [WIP] #13148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions packages/astro/src/core/routing/manifest/create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@ interface Item {
// eslint-disable-next-line regexp/no-super-linear-backtracking
const ROUTE_DYNAMIC_SPLIT = /\[(.+?\(.+?\)|.+?)\]/;
const ROUTE_SPREAD = /^\.{3}.+$/;
const ROUTE_GROUP = /^\(.+\)$/;

export function getParts(part: string, file: string) {
// Skip route group segments
if (ROUTE_GROUP.test(part)) {
return [];
}
const result: RoutePart[] = [];
part.split(ROUTE_DYNAMIC_SPLIT).map((str, i) => {
if (!str) return;
Expand Down Expand Up @@ -161,6 +166,13 @@ function createFileBasedRoutes(
const segment = isDir ? basename : name;
validateSegment(segment, file);

// Check if this is a route group, if yes skip group folder name but process its content
const isRouteGroup = ROUTE_GROUP.test(segment);
if (isRouteGroup && isDir) {
walk(fsMod ?? fs, path.join(dir, basename), parentSegments, parentParams);
continue;
}

const parts = getParts(segment, file);
const isIndex = isDir ? false : basename.substring(0, basename.lastIndexOf('.')) === 'index';
const routeSuffix = basename.slice(basename.indexOf('.'), -ext.length);
Expand Down
Loading