3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-05-22 13:37:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix: transformation of url to cleanUrl / pretty url (#923)

Browse source 
* fix: pretty url should only remove html extension

* cleanUrl of '/index.html' should be '/'
This commit is contained in:
Endilie Yacop Sucipto 2018-08-28 12:09:50 +08:00 • committed by Yangshun Tay
parent ba76eddc87
commit d18b09954b
2 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/core/__tests__/utils.test.js
View file

@ -39,20 +39,29 @@ describe('utils', () => {
}); });
test('getPath', () => { test('getPath', () => {
expect(utils.getPath('/docs/en/versioning.html', true)).toBe( // does not change/transform path
'/docs/en/versioning' expect(utils.getPath('/en/users.html', false)).toBe('/en/users.html');
);
expect(utils.getPath('/en/users.html', true)).toBe('/en/users');
expect(utils.getPath('/docs/en/asd/index.html', true)).toBe('/docs/en/asd');
expect(utils.getPath('/en/help/index.html', true)).toBe('/en/help');
expect(utils.getPath('/en/help.a.b.c.d.e.html', true)).toBe(
'/en/help.a.b.c.d.e'
);
expect(utils.getPath('/en/help.js', true)).toBe('/en/help');
expect(utils.getPath('/docs/en/versioning.html', false)).toBe( expect(utils.getPath('/docs/en/versioning.html', false)).toBe(
'/docs/en/versioning.html' '/docs/en/versioning.html'
); );
expect(utils.getPath('/en/users.html', false)).toBe('/en/users.html'); expect(utils.getPath(undefined, false)).toBeUndefined();
expect(utils.getPath(null, false)).toBeNull();
// transform to pretty/clean path
const cleanPath = pathStr => utils.getPath(pathStr, true);
expect(cleanPath('/en/users')).toBe('/en/users');
expect(cleanPath('/docs/versioning.html')).toBe('/docs/versioning');
expect(cleanPath('/en/users.html')).toBe('/en/users');
expect(cleanPath('/docs/en/asd/index.html')).toBe('/docs/en/asd/');
expect(cleanPath('/en/help/index.html')).toBe('/en/help/');
expect(cleanPath('/index.html')).toBe('/');
expect(cleanPath('/react/index.html')).toBe('/react/');
expect(cleanPath('/en/help.a.b.c.d.e.html')).toBe('/en/help.a.b.c.d.e');
expect(cleanPath('/en/help.js')).toBe('/en/help.js');
expect(cleanPath('/test.md')).toBe('/test.md');
expect(cleanPath('/blog/7.0.0')).toBe('/blog/7.0.0');
expect(cleanPath('/test/5.html.2')).toBe('/test/5.html.2');
expect(cleanPath('/docs/en/5.2')).toBe('/docs/en/5.2');
}); });
test('removeExtension', () => { test('removeExtension', () => {

16
lib/core/utils.js
View file

@ -15,17 +15,17 @@ function extractBlogPostBeforeTruncate(content) {
return content.split(TRUNCATE_MARKER)[0]; return content.split(TRUNCATE_MARKER)[0];
} }
function removeExtension(path) { function removeExtension(pathStr) {
return path.replace(/\.[^/.]+$/, ''); return pathStr.replace(/\.[^/.]+$/, '');
} }
function getPath(path, cleanUrl = false) { function getPath(pathStr, cleanUrl = false) {
if (cleanUrl) { if (!pathStr || !cleanUrl || !pathStr.endsWith('.html')) {
return path.endsWith('/index.html') return pathStr;
? path.replace(/\/index.html$/, '')
: removeExtension(path);
} }
return path; return pathStr.endsWith('/index.html')
? pathStr.replace(/index\.html$/, '')
: removeExtension(pathStr);
} }
module.exports = { module.exports = {