1
0
mirror of https://github.com/verdaccio/verdaccio.git synced 2024-11-08 23:25:51 +01:00

fix(middleware): custom favicon (#4716)

This commit is contained in:
Marc Bernard 2024-07-16 13:28:45 -04:00 committed by GitHub
parent 6ee0afb13a
commit 2a6ee33071
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 60 additions and 1 deletions

@ -0,0 +1,5 @@
---
'@verdaccio/middleware': patch
---
fix(middleware): custom favicon

@ -37,7 +37,15 @@ export function renderWebMiddleware(config, tokenMiddleware, pluginOptions) {
// any match within the static is routed to the file system
router.get('/-/static/*', function (req, res, next) {
const filename = req.params[0];
const file = `${staticPath}/${filename}`;
let file = `${staticPath}/${filename}`;
if (filename === 'favicon.ico' && config?.web?.favicon) {
file = config?.web?.favicon;
if (isURLhasValidProtocol(file)) {
debug('redirect to favicon %s', file);
req.url = file;
return next();
}
}
debug('render static file %o', file);
res.sendFile(file, sendFileCallback(next));
});

@ -65,6 +65,7 @@ export default function renderHTML(
const title = config?.web?.title ?? WEB_TITLE;
const login = hasLogin(config);
const scope = config?.web?.scope ?? '';
const favicon = resolveLogo(config?.web?.favicon, config?.url_prefix, requestOptions);
const logo = resolveLogo(config?.web?.logo, config?.url_prefix, requestOptions);
const logoDark = resolveLogo(config?.web?.logoDark, config?.url_prefix, requestOptions);
const pkgManagers = config?.web?.pkgManagers ?? ['yarn', 'pnpm', 'npm'];
@ -114,6 +115,7 @@ export default function renderHTML(
version,
logo,
logoDark,
favicon,
flags,
login,
pkgManagers,

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

@ -15,6 +15,7 @@ web:
primary_color: '#ffffff'
logo: './test/config/dark-logo.png'
logoDark: './test/config/dark-logo.png'
favicon: './test/config/favicon.ico'
html_cache: false
url_prefix: /prefix

@ -0,0 +1,26 @@
web:
title: verdaccio web
login: true
scope: '@scope'
pkgManagers:
- pnpm
- yarn
showInfo: true
showSettings: true
showSearch: true
showFooter: true
showThemeSwitch: true
showDownloadTarball: true
showRaw: true
primary_color: '#ffffff'
logo: https://raw.githubusercontent.com/verdaccio/verdaccio/master/assets/svg/logo-small.svg
logoDark: https://raw.githubusercontent.com/verdaccio/verdaccio/master/assets/svg/logo-blackwhite.svg
favicon: https://raw.githubusercontent.com/verdaccio/verdaccio/master/website/static/img/favicon/favicon.ico
html_cache: false
url_prefix: /prefix
log: { type: stdout, format: pretty, level: trace }
flags:
changePassword: true

@ -14,6 +14,7 @@ web:
showRaw: true
primary_color: '#ffffff'
logo:
favicon:
html_cache: false
url_prefix: /prefix

@ -86,6 +86,21 @@ describe('test web server', () => {
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logoDark).toMatch('/prefix/-/static/dark-logo.png');
});
test('should render favicon as file', async () => {
const {
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
} = await render('file-logo.yaml');
expect(__VERDACCIO_BASENAME_UI_OPTIONS.favicon).toMatch('/prefix/-/static/favicon.ico');
});
test('should render logo and favicon as URL', async () => {
const {
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
} = await render('http-logo.yaml');
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logo).toMatch(/https:.*logo-small.svg/i);
expect(__VERDACCIO_BASENAME_UI_OPTIONS.favicon).toMatch(/https:.*favicon.ico/i);
});
test('should not render logo as absolute file is wrong', async () => {
const {
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
@ -98,6 +113,7 @@ describe('test web server', () => {
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
} = await render('no-logo.yaml');
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logo).toEqual('');
expect(__VERDACCIO_BASENAME_UI_OPTIONS.favicon).toEqual('');
});
test.todo('should default title');