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

fix(v2): normalizeUrl edge cases (#3427)

Browse source 
* fix(utils): cover normalizeUrl edge cases

* fix(utils): normalizeUrl new edge cases
This commit is contained in:
Rémi Doreau 2020-09-29 17:09:26 +02:00 • committed by GitHub
parent db051eef4f
commit c8d48052b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
packages/docusaurus-utils/src/index.ts
View file

@ -282,6 +282,9 @@ export function normalizeUrl(rawUrls: string[]): string {
const urls = rawUrls;
const resultArray = [];
let hasStartingSlash = false;
let hasEndingSlash = false;
// If the first part is a plain protocol, we combine it with the next part.
if (urls[0].match(/^[^/:]+:\/*$/) && urls.length > 1) {
const first = urls.shift();
@ -302,19 +305,30 @@ export function normalizeUrl(rawUrls: string[]): string {
}
if (component === '') {
if (i === urls.length - 1 && hasEndingSlash) {
resultArray.push('/');
}
// eslint-disable-next-line
continue;
}
if (i > 0) {
// Removing the starting slashes for each component but the first.
component = component.replace(/^[/]+/, '');
if (component !== '/') {
if (i > 0) {
// Removing the starting slashes for each component but the first.
component = component.replace(
/^[/]+/,
// Special case where the first element of rawUrls is empty ["", "/hello"] => /hello
component[0] === '/' && !hasStartingSlash ? '/' : '',
);
}
hasEndingSlash = component[component.length - 1] === '/';
// Removing the ending slashes for each component but the last.
// For the last component we will combine multiple slashes to a single one.
component = component.replace(/[/]+$/, i < urls.length - 1 ? '' : '/');
}
// Removing the ending slashes for each component but the last.
// For the last component we will combine multiple slashes to a single one.
component = component.replace(/[/]+$/, i < urls.length - 1 ? '' : '/');
hasStartingSlash = true;
resultArray.push(component);
}