Infrastructure/verdaccio
0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2025-04-01 02:42:23 -05:00
Code Issues Activity

Merge branch 'master' into snyk-upgrade-d77655948f2b0aa52ea586cedd63fada

Browse source
This commit is contained in:
Juan Picado @jotadeveloper 2020-04-09 00:33:38 +02:00 • committed by GitHub
commit 8c135db633
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
conf/default.yaml
View file

@ -17,6 +17,13 @@ web:
# gravatar: false
# by default packages are ordercer ascendant (asc|desc)
# sort_packages: asc
# convert your UI to the dark side
# darkMode: true
# translate your registry, api i18n not available yet
# i18n:
# list of the available translations https://github.com/verdaccio/ui/tree/master/i18n/translations
# web: en-US
auth:
htpasswd:

6
conf/docker.yaml
View file

@ -23,6 +23,12 @@ web:
# gravatar: false
# by default packages are ordercer ascendant (asc|desc)
# sort_packages: asc
# darkMode: true
# translate your registry, api i18n not available yet
# i18n:
# list of the available translations https://github.com/verdaccio/ui/tree/master/i18n/translations
# web: en-US
auth:
htpasswd:

2
package.json
View file

@ -24,7 +24,7 @@
"@verdaccio/local-storage": "^9.3.4",
"@verdaccio/readme": "^9.3.3",
"@verdaccio/streams": "^9.3.2",
"@verdaccio/ui-theme": "^1.0.0",
"@verdaccio/ui-theme": "^1.5.0",
"JSONStream": "1.3.5",
"async": "3.2.0",
"body-parser": "1.19.0",

29
src/api/web/index.ts
View file

@ -16,6 +16,8 @@ import loadPlugin from '../../lib/plugin-loader';
const { setSecurityWebHeaders } = require('../middleware');
const pkgJSON = require('../../../package.json');
const DEFAULT_LANGUAGE = 'es-US';
export function loadTheme(config) {
if (_.isNil(config.theme) === false) {
return _.head(
@ -32,6 +34,15 @@ export function loadTheme(config) {
}
}
export function validatePrimaryColor(primaryColor) {
const isHex = /^#+([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/i.test(primaryColor);
if (!isHex) {
return '';
}
return primaryColor;
}
const sendFileCallback = next => err => {
if (!err) {
return;
@ -80,11 +91,23 @@ export default function(config, auth, storage) {
const { url_prefix } = config;
const uri = `${protocol}://${host}`;
const base = combineBaseUrl(protocol, host, url_prefix);
const languageWeb = config?.i18n?.web ?? 'es-US';
const primaryColor = _.get(config, 'web.primary_color') ? config.web.primary_color : '';
const language = config?.i18n?.web ?? DEFAULT_LANGUAGE;
const darkMode = config?.web?.darkMode ?? false;
const primaryColor = validatePrimaryColor(config?.web?.primary_color);
const title = _.get(config, 'web.title') ? config.web.title : WEB_TITLE;
const scope = _.get(config, 'web.scope') ? config.web.scope : '';
const options = { uri, protocol, host, url_prefix, base, primaryColor, title, scope, language: languageWeb };
const options = {
uri,
darkMode,
protocol,
host,
url_prefix,
base,
primaryColor,
title,
scope,
language,
};
const webPage = template
.replace(/ToReplaceByVerdaccioUI/g, JSON.stringify(options))

8
yarn.lock
View file

@ -1969,10 +1969,10 @@
resolved "https://registry.verdaccio.org/@verdaccio%2fui-theme/-/ui-theme-0.3.9.tgz#6ff0f05315912b4ba39e29eb589ecc8833640990"
integrity sha512-InTpEowYo6M9TjpQh4cVh/HZH1DW9oyhy8UpC1H4FOwvyknctN0dMavOseKWSrPAj+gPDzUw0IKAvwDI4OcPEg==
"@verdaccio/ui-theme@^1.0.0":
version "1.0.0"
resolved "https://registry.verdaccio.org/@verdaccio%2fui-theme/-/ui-theme-1.0.0.tgz#53706449fdb2e66e06a22867deb3efedf6ddc9d2"
integrity sha512-gUggtAV9lOa2SmhYZmRRd/AGR5HmZ+N3uGoXnZXVjPckTetE/fsB8mqkSYZCk0SrO767j82JGhyU8O/JVKM8jw==
"@verdaccio/ui-theme@^1.5.0":
version "1.5.0"
resolved "https://registry.verdaccio.org/@verdaccio%2fui-theme/-/ui-theme-1.5.0.tgz#748e2db1772106a4de64dbed1152e16cd4b34a7c"
integrity sha512-OLkTTJPnBgUDsRrGqIg5RC3NBmb7wolQEPrTGE1ScuVe0sO3351fw+TFj/hx5Oepbv4PqxknYossmWcrMaSq6Q==
"@yarnpkg/lockfile@^1.1.0":
version "1.1.0"