3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-06-04 11:52:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(core): prevent useBaseUrl returning /base/base when on /base (#6993)

Browse source
This commit is contained in:
Joshua Chen 2022-03-25 16:40:56 +08:00 • committed by GitHub
parent dc95cb86ca
commit e8800b9d49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/docusaurus/src/client/exports/__tests__/useBaseUrl.test.tsx
View file

@ -77,6 +77,7 @@ describe('useBaseUrl', () => {
expect(mockUseBaseUrl('/hello/foo', {absolute: true})).toBe( expect(mockUseBaseUrl('/hello/foo', {absolute: true})).toBe(
'https://docusaurus.io/docusaurus/hello/foo', 'https://docusaurus.io/docusaurus/hello/foo',
); );
expect(mockUseBaseUrl('/docusaurus')).toBe('/docusaurus/');
expect(mockUseBaseUrl('/docusaurus/')).toBe('/docusaurus/'); expect(mockUseBaseUrl('/docusaurus/')).toBe('/docusaurus/');
expect(mockUseBaseUrl('/docusaurus/hello')).toBe('/docusaurus/hello'); expect(mockUseBaseUrl('/docusaurus/hello')).toBe('/docusaurus/hello');
expect(mockUseBaseUrl('#hello')).toBe('#hello'); expect(mockUseBaseUrl('#hello')).toBe('#hello');
@ -143,6 +144,7 @@ describe('useBaseUrlUtils().withBaseUrl()', () => {
expect(withBaseUrl('/hello/foo', {absolute: true})).toBe( expect(withBaseUrl('/hello/foo', {absolute: true})).toBe(
'https://docusaurus.io/docusaurus/hello/foo', 'https://docusaurus.io/docusaurus/hello/foo',
); );
expect(withBaseUrl('/docusaurus')).toBe('/docusaurus/');
expect(withBaseUrl('/docusaurus/')).toBe('/docusaurus/'); expect(withBaseUrl('/docusaurus/')).toBe('/docusaurus/');
expect(withBaseUrl('/docusaurus/hello')).toBe('/docusaurus/hello'); expect(withBaseUrl('/docusaurus/hello')).toBe('/docusaurus/hello');
expect(withBaseUrl('#hello')).toBe('#hello'); expect(withBaseUrl('#hello')).toBe('#hello');

6
packages/docusaurus/src/client/exports/useBaseUrl.ts
View file

@ -33,6 +33,12 @@ function addBaseUrl(
return baseUrl + url.replace(/^\//, ''); return baseUrl + url.replace(/^\//, '');
} }
// /baseUrl -> /baseUrl/
// https://github.com/facebook/docusaurus/issues/6315
if (url === baseUrl.replace(/\/$/, '')) {
return baseUrl;
}
// We should avoid adding the baseurl twice if it's already there // We should avoid adding the baseurl twice if it's already there
const shouldAddBaseUrl = !url.startsWith(baseUrl); const shouldAddBaseUrl = !url.startsWith(baseUrl);