sombochea/verdaccio-ui
1
0
Fork 1
mirror of https://github.com/SomboChea/ui synced 2026-01-19 01:25:51 +07:00
Code Issues Releases Wiki Activity

Revert "fix(#300): correctly reference registry url from options" (#311)

Browse Source
This commit is contained in:
Priscila Oliveira
2019-11-24 20:17:28 +01:00
committed by GitHub
parent ee74474811
commit d955268c25
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/url.test.ts
View File

@@ -17,18 +17,14 @@ describe('utils', () => {
expect(isEmail('')).toBeFalsy();
});
test('getRegistryURL() - should not change when location change', () => {
expect(getRegistryURL()).toBe('http://localhost');
test('getRegistryURL() - should keep slash if location is a sub directory', () => {
history.pushState({}, 'page title', '/-/web/detail');
expect(getRegistryURL()).toBe('http://localhost');
expect(getRegistryURL()).toBe('http://localhost/-/web/detail');
history.pushState({}, 'page title', '/');
});
test('getRegistryURL() - should change when UI options change', () => {
test('getRegistryURL() - should not add slash if location is not a sub directory', () => {
expect(getRegistryURL()).toBe('http://localhost');
window.__VERDACCIO_BASENAME_UI_OPTIONS.base = 'http://localhost/test';
expect(getRegistryURL()).toBe('http://localhost/test');
window.__VERDACCIO_BASENAME_UI_OPTIONS.base = 'http://localhost';
});
});

3
src/utils/url.ts
View File

@@ -15,7 +15,8 @@ export function isEmail(email: string): boolean {
}
export function getRegistryURL(): string {
return window.__VERDACCIO_BASENAME_UI_OPTIONS.base;
// Don't add slash if it's not a sub directory
return `${location.origin}${location.pathname === '/' ? '' : location.pathname}`;
}
export function extractFileName(url: string): string {