Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/react/src/reactrouter-compat-utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ export function resolveRouteNameAndSource(
if (enableAsyncRouteHandlers && lazyRouteManifest && lazyRouteManifest.length > 0) {
const manifestMatch = matchRouteManifest(location.pathname, lazyRouteManifest, basename);
if (manifestMatch) {
return [(stripBasename ? '' : basename) + manifestMatch, 'route'];
return [(stripBasename ? '' : trimSlash(basename)) + manifestMatch, 'route'];
}
}

Expand Down
15 changes: 15 additions & 0 deletions packages/react/test/reactrouter-compat-utils/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,21 @@ describe('reactrouter-compat-utils/utils', () => {
});

describe('resolveRouteNameAndSource', () => {
it.each([
{ basename: '/app/', pathname: '/app/users/42', expected: '/app/users/:id' },
{ basename: '/', pathname: '/users/42', expected: '/users/:id' },
])('avoids double slashes in manifest route names with basename $basename', ({ basename, pathname, expected }) => {
const config = makeConfig({
enableAsyncRouteHandlers: true,
lazyRouteManifest: ['/users/:id'],
basename,
});

const result = resolveRouteNameAndSource({ pathname }, [], [], [], config);

expect(result).toEqual([expected, 'route']);
});

it('should use descendant route when location is inside one', () => {
const location: Location = { pathname: '/users/123/profile' };
const routes: RouteObject[] = [{ path: '/users', element: null }];
Expand Down
Loading