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

fix(core): prevent 404 when accessing /page.html #7184

Merged
merged 13 commits into from
Apr 22, 2022
Merged

fix(core): prevent 404 when accessing /page.html #7184

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eac5fe7
fix(core): normalize /path.html to /path to prevent 404
Josh-Cena Apr 17, 2022
76c2f2c
test no trailing slash
Josh-Cena Apr 17, 2022
49a9fe2
dogfood?
Josh-Cena Apr 21, 2022
9157cd5
Merge branch 'main' into jc/fix-normalize-location
Josh-Cena Apr 22, 2022
5134e87
revert last change
Josh-Cena Apr 22, 2022
77513e1
does this fix
Josh-Cena Apr 22, 2022
0cf606a
ignore
Josh-Cena Apr 22, 2022
63447e0
add test
Josh-Cena Apr 22, 2022
67fa969
fix
Josh-Cena Apr 22, 2022
91e0fdb
properly fix
Josh-Cena Apr 22, 2022
d4c982e
fix again
Josh-Cena Apr 22, 2022
12eeedb
revert trailing slash change
Josh-Cena Apr 22, 2022
2b82e53
optimize: use map instead of object
Josh-Cena Apr 22, 2022
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/docusaurus/src/client/__tests__/normalizeLocation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ describe('normalizeLocation', () => {
hash: '#bar',
}),
).toEqual({
pathname: '/docs/introduction/foo.html',
pathname: '/docs/introduction/foo',
search: '',
hash: '#bar',
});
Expand Down
2 changes: 1 addition & 1 deletion packages/docusaurus/src/client/normalizeLocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function normalizeLocation<T extends Location>(location: T): T {
}

const pathname =
location.pathname.trim().replace(/\/index\.html$/, '') || '/';
location.pathname.trim().replace(/(?:\/index)?\.html$/, '') || '/';

pathnames[location.pathname] = pathname;

Expand Down
2 changes: 1 addition & 1 deletion website/docusaurus.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const config = {
// Dogfood both settings:
// - force trailing slashes for deploy previews
// - avoid trailing slashes in prod
trailingSlash: isDeployPreview,
trailingSlash: false,
Josh-Cena marked this conversation as resolved.
Show resolved Hide resolved
stylesheets: [
{
href: '/katex/katex.min.css',
Expand Down