Compare commits

...

40 Commits

Author SHA1 Message Date
Juan Picado
c9bd22dcaa chore: update versions (6-next) (#3620)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-02-23 13:13:33 +01:00
薄涛
378e907d53 fix(core): fix bug about isObject function (#3647) 2023-02-23 11:24:26 +01:00
renovate[bot]
1641dc3325 fix(deps): update dependency marked to v4.2.12 (#3645) 2023-02-22 08:59:37 +01:00
Juan Picado
30a967a62b disable workflow, to review 2023-02-20 19:49:47 +01:00
Juan Picado
e0fb074464 chore: fix docker tests 2023-02-20 19:44:49 +01:00
Juan Picado
83f2d654e0 fix config docker issue 2023-02-20 07:24:44 +01:00
Juan Picado
59af78d439 docker upgrade base image from 16 to 18 2023-02-20 07:19:47 +01:00
Juan Picado
d92cffadad add e2e for docker images
increse
2023-02-20 07:16:35 +01:00
Juan Picado
7fe57531ea docker add linux/arm64 build 2023-02-19 23:22:37 +01:00
renovate[bot]
80b93b9d99 fix(deps): update dependency validator to v13.9.0 (#3640)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 22:44:41 +01:00
renovate[bot]
4ee90e4124 fix(deps): update dependency lru-cache to v7.16.1 (#3639)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 22:29:16 +01:00
renovate[bot]
e7b9c78508 fix(deps): update dependency fastify to v4.13.0 (#3638)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 21:34:10 +01:00
renovate[bot]
989d64a6f0 fix(deps): update dependency typedoc to v0.23.25 (#3637) 2023-02-19 13:30:54 +01:00
renovate[bot]
a52594f54b fix(deps): update dependency redux to v4.2.1 (#3635) 2023-02-19 11:43:39 +01:00
Juan Picado
4fc21146ab fix: missing logo on header (#3636) 2023-02-19 11:43:28 +01:00
renovate[bot]
3dc0fd41f4 fix(deps): update dependency @crowdin/crowdin-api-client to v1.21.2 (#3634)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 09:28:57 +01:00
renovate[bot]
038756fd9c fix(deps): update docusaurus monorepo to v2.3.1 (#3633)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 09:00:46 +01:00
renovate[bot]
762692341a fix(deps): update dependency core-js to v3.28.0 (#3632)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 08:12:57 +01:00
renovate[bot]
871646da4e fix(deps): update dependency dompurify to v2.4.4 (#3631) 2023-02-19 01:55:16 +01:00
renovate[bot]
59be6bc170 fix(deps): update dependency @yarnpkg/cli-dist to v3.4.1 (#3629)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 01:16:11 +01:00
renovate[bot]
44f8674061 fix(deps): update dependency clipanion to v3.2.0 (#3630)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 01:15:06 +01:00
renovate[bot]
a1c8652eb1 fix(deps): update dependency npm to v8.19.4 (#3627)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 00:39:37 +01:00
renovate[bot]
9e3abf9830 fix(deps): update dependency npm to v9.5.0 (#3628)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 00:39:27 +01:00
renovate[bot]
08ff0aef3c fix(deps): update dependency pino to v8.10.0 (#3626)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-19 00:17:10 +01:00
renovate[bot]
35408cfc42 fix(deps): update material-ui monorepo to v5.11.9 (#3625)
* fix(deps): update material-ui monorepo to v5.11.9

* Update Search.test.tsx.snap

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Juan Picado <juanpicado19@gmail.com>
2023-02-19 00:16:59 +01:00
Juan Picado
76c4aa1d43 Update renovate.json 2023-02-18 22:49:30 +01:00
Juan Picado
4d4d63c2b1 Update renovate.json 2023-02-18 22:47:48 +01:00
Juan Picado
be8367ef38 chore: update dependencies (#3621)
* chore: update deps

* Update pnpm-lock.yaml
2023-02-18 22:44:45 +01:00
Juan Picado
0ad69d58c9 Update renovate.json 2023-02-18 19:54:45 +01:00
Juan Picado
8d4f4fffef Update renovate.json 2023-02-18 19:53:54 +01:00
renovate[bot]
1096aa9fc6 fix(deps): update all linting dependencies (major) (#3622)
* fix(deps): update all linting dependencies

* fix lint

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Juan Picado <juanpicado19@gmail.com>
2023-02-18 19:52:31 +01:00
Juan Picado
83e4669aba fix website build 2023-02-18 16:42:05 +01:00
Juan Picado
c827e6b57a Update renovate.json 2023-02-18 16:10:26 +01:00
Juan Picado
8c444df1b9 Update renovate.json 2023-02-18 16:03:08 +01:00
Juan Picado
b152256692 Update renovate.json 2023-02-18 15:44:58 +01:00
Juan Picado
781ac9ac25 docs: add docs for theme and filter plugins (#3619)
* docs: add docs for theme and filter plugins

* typos

* typos

* Create strong-socks-type.md

* Update plugins.md

* typos
2023-02-18 15:42:19 +01:00
Juan Picado
4f711109df Update renovate.json 2023-02-18 15:40:49 +01:00
renovate[bot]
35fa14eb66 fix(deps): update all linting dependencies (#3618)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-02-18 15:29:57 +01:00
Juan Picado
0a37a9808a chore: update versions (6-next) (#3611)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-02-14 21:58:20 +01:00
Juan Picado
d167f92e18 rollback yaml support old nodejs versions (#3610) 2023-02-14 21:44:08 +01:00
157 changed files with 3934 additions and 7996 deletions

View File

@@ -0,0 +1,6 @@
---
'@verdaccio/test-cli-commons': minor
'@verdaccio/config': minor
---
chore: rollback yaml dep support old nodejs versions

View File

@@ -0,0 +1,8 @@
---
'@verdaccio/types': patch
'@verdaccio/middleware': patch
'@verdaccio/ui-theme': patch
'@verdaccio/web': patch
---
fix: missing logo on header

View File

@@ -0,0 +1,5 @@
---
'@verdaccio/core': patch
---
fix(core): fix `isObject` function.`isObject(true)` should return false.

View File

@@ -92,6 +92,7 @@
"fuzzy-onions-draw",
"gentle-parrots-lay",
"gentle-trains-switch",
"giant-years-trade",
"gold-vans-tease",
"green-yaks-divide",
"healthy-bikes-behave",
@@ -113,6 +114,7 @@
"moody-clocks-roll",
"neat-toes-report",
"neat-toys-float",
"old-apples-fail",
"olive-candles-speak",
"orange-cows-pull",
"orange-flowers-cover",
@@ -122,6 +124,7 @@
"plenty-news-remember",
"plenty-spiders-melt",
"plenty-tables-refuse",
"poor-suns-film",
"pretty-hounds-tap",
"proud-jeans-walk",
"proud-jobs-hope",
@@ -144,6 +147,7 @@
"spicy-radios-remain",
"spicy-snakes-sip",
"strange-ladybugs-nail",
"strong-socks-type",
"swift-pumpkins-knock",
"ten-parents-breathe",
"tender-bags-call",

View File

@@ -0,0 +1,7 @@
---
'@verdaccio/ui-theme': major
'@verdaccio/ui-components': major
'@verdaccio/web': major
---
fix package configuration issues

39
.github/disabled/docker-plugins-e2e.yml vendored Normal file
View File

@@ -0,0 +1,39 @@
name: E2E Docker Proxy Plugins Test
on:
workflow_dispatch:
push:
branches:
- 'master'
schedule:
# run every sunday
- cron: '0 0 * * 0'
jobs:
docker:
timeout-minutes: 10
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
- name: Start containers
run: docker-compose -f "./e2e/docker/docker-build-install-plugin/docker-compose.yaml" up -d --build
- name: Install node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
with:
node-version: 18
- name: verdaccio cli
run: npm install -g verdaccio --registry=http://localhost:4873
- name: gastby cli
run: npm install -g gatsby-cli --registry http://localhost:4873
- name: netlify cli
run: npm install -g netlify-cli --registry http://localhost:4873
- name: angular cli
run: npm install -g @angular/cli --registry http://localhost:4873
- name: Stop containers
if: always()
run: docker-compose -f "./e2e/docker/docker-build-install-plugin/docker-compose.yaml" down

View File

@@ -0,0 +1,38 @@
name: E2E Docker Proxy Apache Test
on:
workflow_dispatch:
push:
branches:
- 'master'
schedule:
# run every sunday
- cron: '0 0 * * 0'
jobs:
docker:
timeout-minutes: 10
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
- name: Start containers
run: docker-compose -f "./e2e/docker/apache-verdaccio/docker-compose.yaml" up -d --build
- name: Install node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
with:
node-version: 18
- name: verdaccio cli
run: npm install -g verdaccio --registry http://localhost
- name: gastby cli
run: npm install -g gatsby-cli --registry http://localhost
- name: netlify cli
run: npm install -g netlify-cli --registry http://localhost
- name: angular cli
run: npm install -g @angular/cli --registry http://localhost
- name: Stop containers
if: always()
run: docker-compose -f "./e2e/docker/apache-verdaccio/docker-compose.yaml" down

View File

@@ -0,0 +1,41 @@
name: E2E Docker Proxy Nginx Test
on:
workflow_dispatch:
push:
branches:
- 'master'
jobs:
docker:
timeout-minutes: 10
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
- name: Start containers
run: docker-compose -f "./e2e/docker/proxy-nginx/docker-compose.yaml" up -d --build
- name: Install node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
with:
node-version: 18
- name: npm setup
run: |
npm config set fetch-retries="5"
npm config set fetch-retry-factor="50"
npm config set fetch-retry-mintimeout="20000"
npm config set fetch-retry-maxtimeout="80000"
- name: verdaccio cli
run: npm install -g verdaccio --registry http://localhost
- name: gastby cli
run: npm install -g gatsby-cli --registry http://localhost
- name: netlify cli
run: npm install -g netlify-cli --registry http://localhost
- name: angular cli
run: npm install -g @angular/cli --registry http://localhost
- name: Stop containers
if: always()
run: docker-compose -f "./e2e/docker/proxy-nginx/docker-compose.yaml" down

View File

@@ -49,7 +49,7 @@ jobs:
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}

View File

@@ -1,4 +1,4 @@
FROM --platform=${BUILDPLATFORM:-linux/amd64} node:16-alpine as builder
FROM --platform=${BUILDPLATFORM:-linux/amd64} node:18-alpine as builder
ENV NODE_ENV=development \
VERDACCIO_BUILD_REGISTRY=https://registry.verdaccio.org
@@ -20,7 +20,7 @@ RUN npm -g i pnpm@6.32.15 && \
# FIXME: need to remove devDependencies from the build
# RUN pnpm install --prod --ignore-scripts
FROM node:16-alpine
FROM node:18-alpine
LABEL maintainer="https://github.com/verdaccio/verdaccio"
ENV VERDACCIO_APPDIR=/opt/verdaccio \

View File

@@ -1,5 +1,11 @@
# @verdaccio/test-cli-commons
## 1.1.0-6-next.6
### Minor Changes
- d167f92e: chore: rollback yaml dep support old nodejs versions
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,19 +1,19 @@
{
"private": true,
"name": "@verdaccio/test-cli-commons",
"version": "1.0.1-6-next.5",
"version": "1.1.0-6-next.6",
"main": "./build/index.js",
"types": "./build/index.d.ts",
"devDependencies": {
"verdaccio": "workspace:6.0.0-6-next.60",
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"yaml": "2.2.0",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/types": "workspace:11.0.0-6-next.21",
"debug": "4.3.4",
"fs-extra": "10.1.0",
"got": "11.8.6",
"lodash": "4.17.21"
"got": "11.8.5",
"js-yaml": "4.1.0",
"lodash": "4.17.21",
"verdaccio": "workspace:6.0.0-6-next.62"
},
"scripts": {
"test": "jest",

View File

@@ -1,7 +1,7 @@
import { cp, writeFile } from 'fs/promises';
import YAML from 'js-yaml';
import { join } from 'path';
import { URL } from 'url';
import YAML from 'yaml';
import { Dependencies } from '@verdaccio/types';
@@ -25,7 +25,7 @@ export function createYamlConfig(registry: string, token?: string) {
};
}
return YAML.stringify(defaultYaml);
return YAML.dump(defaultYaml);
}
export async function prepareYarnModernProject(

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-npm6
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,9 +1,9 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-npm6",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"npm": "6.14.18"
},
"scripts": {

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-npm7
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,9 +1,9 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-npm7",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"npm": "7.24.2"
},
"scripts": {

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-npm8
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,10 +1,10 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-npm8",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"npm": "8.19.3"
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"npm": "8.19.4"
},
"scripts": {
"test": "jest"

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-npm9
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,10 +1,10 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-npm9",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"npm": "9.2.0"
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"npm": "9.5.0"
},
"scripts": {
"test": "jest"

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-pnpm6
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,10 +1,10 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-pnpm6",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"pnpm": "latest-6"
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"pnpm": "^6.35.1"
},
"scripts": {
"test": "jest"

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-pnpm7
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,10 +1,10 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-pnpm7",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"pnpm": "next-7"
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"pnpm": "^7.27.1"
},
"scripts": {
"test": "jest"

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-yarn1
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,9 +1,9 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-yarn1",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"yarn": "1.22.19"
},
"scripts": {

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-yarn2
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,9 +1,9 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-yarn2",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"@yarnpkg/cli-dist": "2.4.2"
},
"scripts": {

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-yarn3
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

View File

@@ -1,10 +1,10 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-yarn3",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5",
"@yarnpkg/cli-dist": "3.3.1"
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6",
"@yarnpkg/cli-dist": "3.4.1"
},
"scripts": {
"test": "jest"

View File

@@ -1,5 +1,12 @@
# @verdaccio/e2e-cli-yarn4
## 1.0.1-6-next.6
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/test-cli-commons@1.1.0-6-next.6
## 1.0.1-6-next.5
### Patch Changes

File diff suppressed because one or more lines are too long

View File

@@ -1,9 +1,10 @@
{
"private": true,
"name": "@verdaccio/e2e-cli-yarn4",
"version": "1.0.1-6-next.5",
"version": "1.0.1-6-next.6",
"dependencies": {
"@verdaccio/test-cli-commons": "workspace:1.0.1-6-next.5"
"@yarnpkg/cli-dist": "4.0.0-rc.39",
"@verdaccio/test-cli-commons": "workspace:1.1.0-6-next.6"
},
"scripts": {
"test": "jest"

View File

@@ -7,10 +7,7 @@ export function getCommand(projectFolder) {
}
export function getYarnCommand() {
// FUTURE: yarn 4 rc still not available via registry
// tags: https://repo.yarnpkg.com/tags
// download binary: https://repo.yarnpkg.com/4.0.0-rc.14/packages/yarnpkg-cli/bin/yarn.js
return join(__dirname, './bin/yarn-4.0.0-rc.14.cjs');
return join(__dirname, './node_modules/@yarnpkg/cli-dist/bin/yarn.js');
}
export function yarn(projectFolder, ...args: string[]) {

View File

@@ -0,0 +1,6 @@
FROM eboraas/apache
LABEL Juan Picado <jotadeveloper@gmail.com>
# http://pierrecaserta.com/apache-proxy-one-docker-server-many-domains/
RUN a2enmod proxy
COPY ./conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
COPY ./conf/env.load /etc/apache2/mods-enabled/env.load

View File

@@ -0,0 +1,17 @@
ServerName localhost:80
ServerAdmin admin@localhost
<VirtualHost *:80>
ServerName localhost
<Proxy *>
Allow from localhost
</Proxy>
SSLProxyEngine On
ProxyRequests Off
ProxyPreserveHost On
AllowEncodedSlashes NoDecode
ProxyPass / http://verdaccio:4873/ nocanon
ProxyPassReverse / http://verdaccio:4873/
CustomLog /var/log/apache2/verdaccio-access.log combined
ErrorLog /var/log/apache2/verdaccio-error.log
</VirtualHost>

View File

@@ -0,0 +1,4 @@
LoadModule env_module /usr/lib/apache2/modules/mod_env.so
LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so

View File

@@ -0,0 +1,23 @@
version: '2'
services:
verdaccio:
image: verdaccio/verdaccio:nightly-master
container_name: verdaccio
ports:
- '4873:4873'
volumes:
- verdaccio:/verdaccio
apacheproxy:
build: apache_proxy/
links:
- verdaccio
ports:
- '80:80'
volumes_from:
- verdaccio
volumes:
verdaccio:
driver: local

View File

@@ -0,0 +1,9 @@
FROM verdaccio/verdaccio:nightly-master
LABEL Juan Picado <jotadeveloper@gmail.com>
ADD docker.yaml /verdaccio/conf/config.yaml
USER root
RUN npm install --global verdaccio-static-token \
# && npm install --global verdaccio-memory@6-next \
&& npm install --global verdaccio-auth-memory@6-next
USER $VERDACCIO_USER_UID

View File

@@ -0,0 +1,12 @@
version: '2'
services:
verdaccio:
build: .
ports:
- '4873:4873'
volumes:
- verdaccio:/verdaccio
volumes:
verdaccio:
driver: local

View File

@@ -0,0 +1,46 @@
# store:
# memory:
# limit: 1000
storage: ./storage
plugins: /verdaccio/plugins
web:
title: Verdaccio Publish Config Test
auth:
auth-memory:
users:
foo:
name: foo
password: s3cret
bar:
name: bar
password: s3cret
uplinks:
npmjs:
url: https://registry.npmjs.org/
packages:
'@*/*':
access: $all
publish: $authenticated
unpublish: $authenticated
proxy: npmjs
'**':
access: $all
publish: $authenticated
unpublish: $authenticated
proxy: npmjs
server:
keepAliveTimeout: 60
middlewares:
audit:
enabled: true
static-token:
- token: mySecureToken
user: systemUser
password: systemPassword
- token: ABCD1234
user: uncle
password: tom
log: { type: stdout, format: pretty, level: http }

View File

@@ -0,0 +1,3 @@
FROM verdaccio/verdaccio:nightly-master
LABEL Juan Picado <jotadeveloper@gmail.com>
ADD docker.yaml /verdaccio/conf/config.yaml

View File

@@ -0,0 +1,12 @@
version: '2'
services:
verdaccio:
build: .
ports:
- '4873:4873'
volumes:
- verdaccio:/verdaccio
volumes:
verdaccio:
driver: local

View File

@@ -0,0 +1,37 @@
storage: /verdaccio/storage/data
plugins: /verdaccio/plugins
web:
enable: true
title: verdaccio-server-e2e
login: true
auth:
htpasswd:
file: /verdaccio/storage/htpasswd
uplinks:
npmjs:
url: https://registry.npmjs.org/
packages:
'@verdaccio/*':
access: $all
publish: $authenticated
'@*/*':
access: $all
publish: $authenticated
unpublish: $authenticated
proxy: npmjs
'**':
access: $all
publish: $authenticated
unpublish: $authenticated
proxy: npmjs
middlewares:
audit:
enabled: true
log: { type: stdout, format: json, level: info }

View File

@@ -0,0 +1,3 @@
FROM tutum/nginx
RUN rm /etc/nginx/sites-enabled/default
ADD sites-enabled /etc/nginx/sites-enabled

View File

@@ -0,0 +1,14 @@
server {
listen 80 default_server;
access_log /var/log/nginx/verdaccio.log;
charset utf-8;
location / {
proxy_pass http://verdaccio:4873/;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}
}

View File

@@ -0,0 +1,26 @@
version: '2'
services:
verdaccio:
image: verdaccio/verdaccio:nightly-master
container_name: verdaccio_root_path
ports:
- '4873:4873'
volumes:
- verdaccio:/verdaccio
nginx:
restart: always
build: conf/nginx
ports:
- '80:80'
volumes:
- /www/public
volumes_from:
- verdaccio
links:
- verdaccio:verdaccio
volumes:
verdaccio:
driver: local

View File

@@ -3,9 +3,9 @@
"name": "@verdaccio/e2e-ui",
"version": "2.0.0-6-next.3",
"devDependencies": {
"verdaccio": "workspace:6.0.0-6-next.60",
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"verdaccio": "workspace:6.0.0-6-next.62",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/test-helper": "workspace:2.0.0-6-next.7",
"debug": "4.3.4",
"cypress": "11.2.0"

View File

@@ -38,74 +38,73 @@
"@babel/preset-typescript": "7.18.6",
"@babel/register": "7.18.9",
"@babel/runtime": "7.20.7",
"@dianmora/contributors": "5.0.0",
"@changesets/changelog-github": "0.4.8",
"@changesets/cli": "2.24.4",
"@changesets/get-dependents-graph": "1.3.5",
"@crowdin/cli": "3.9.1",
"@dianmora/contributors": "5.0.0",
"@emotion/react": "11.10.5",
"@emotion/styled": "11.10.5",
"@testing-library/dom": "8.19.1",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "12.1.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"@trivago/prettier-plugin-sort-imports": "3.4.0",
"@trivago/prettier-plugin-sort-imports": "^4.0.0",
"@types/async": "3.2.16",
"@types/express": "4.17.15",
"@types/http-errors": "1.8.2",
"@types/jest": "27.5.2",
"@types/jsonwebtoken": "8.5.9",
"@types/lodash": "4.14.191",
"@types/mime": "2.0.3",
"@types/minimatch": "3.0.5",
"@types/redux": "3.6.0",
"@types/node": "16.18.10",
"@types/jsonwebtoken": "8.5.9",
"@types/request": "2.48.8",
"@types/semver": "7.3.13",
"@types/node-fetch": "2.6.2",
"@types/supertest": "2.0.12",
"@types/testing-library__jest-dom": "5.14.5",
"@types/validator": "13.7.10",
"@types/webpack": "5.28.0",
"@types/webpack-env": "1.18.0",
"@types/react": "18.0.26",
"@types/react-dom": "18.0.9",
"@types/react-router-dom": "5.3.3",
"@types/react-virtualized": "9.21.21",
"@typescript-eslint/eslint-plugin": "5.49.0",
"@typescript-eslint/parser": "5.49.0",
"@types/redux": "3.6.0",
"@types/request": "2.48.8",
"@types/semver": "7.3.13",
"@types/supertest": "2.0.12",
"@types/testing-library__jest-dom": "5.14.5",
"@types/validator": "13.7.12",
"@types/webpack": "5.28.0",
"@types/webpack-env": "1.18.0",
"@typescript-eslint/eslint-plugin": "5.52.0",
"@typescript-eslint/parser": "5.52.0",
"@verdaccio/crowdin-translations": "workspace:*",
"@verdaccio/eslint-config": "workspace:*",
"@verdaccio/types": "workspace:*",
"@verdaccio/ui-theme": "workspace:*",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.1.0",
"babel-jest": "29.3.1",
"babel-jest": "29.4.3",
"babel-plugin-dynamic-import-node": "2.3.3",
"babel-plugin-emotion": "10.2.2",
"concurrently": "6.5.1",
"core-js": "3.27.0",
"cross-env": "7.0.3",
"debug": "4.3.4",
"detect-secrets": "1.0.6",
"jest-diff": "29.3.1",
"eslint": "8.33.0",
"eslint": "8.34.0",
"fs-extra": "10.1.0",
"got": "11.8.5",
"husky": "7.0.4",
"in-publish": "2.0.1",
"jest": "29.3.1",
"jest-environment-jsdom": "29.3.1",
"jest": "29.4.3",
"jest-diff": "29.4.3",
"jest-environment-jsdom": "29.4.3",
"jest-environment-jsdom-global": "3.1.2",
"jest-environment-node": "29.3.1",
"jest-junit": "12.3.0",
"kleur": "3.0.3",
"lint-staged": "11.2.6",
"got": "11.8.6",
"nock": "13.2.9",
"nodemon": "2.0.20",
"npm-run-all": "4.1.5",
"prettier": "2.8.3",
"prettier": "2.8.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"rimraf": "3.0.2",
"selfsigned": "1.10.14",
"supertest": "6.3.3",

View File

@@ -1,5 +1,32 @@
# @verdaccio/api
## 6.0.0-6-next.45
### Patch Changes
- Updated dependencies [4fc21146]
- Updated dependencies [378e907d]
- @verdaccio/middleware@6.0.0-6-next.41
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/auth@6.0.0-6-next.41
- @verdaccio/logger@6.0.0-6-next.30
- @verdaccio/store@6.0.0-6-next.42
- @verdaccio/config@6.0.0-6-next.62
- @verdaccio/utils@6.0.0-6-next.30
## 6.0.0-6-next.44
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/config@6.0.0-6-next.61
- @verdaccio/auth@6.0.0-6-next.40
- @verdaccio/middleware@6.0.0-6-next.40
- @verdaccio/store@6.0.0-6-next.41
- @verdaccio/core@6.0.0-6-next.61
- @verdaccio/utils@6.0.0-6-next.29
- @verdaccio/logger@6.0.0-6-next.29
## 6.0.0-6-next.43
### Minor Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/api",
"version": "6.0.0-6-next.43",
"version": "6.0.0-6-next.45",
"description": "loaders logic",
"main": "./build/index.js",
"types": "build/index.d.ts",
@@ -39,13 +39,13 @@
},
"license": "MIT",
"dependencies": {
"@verdaccio/auth": "workspace:6.0.0-6-next.39",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"@verdaccio/middleware": "workspace:6.0.0-6-next.39",
"@verdaccio/store": "workspace:6.0.0-6-next.40",
"@verdaccio/utils": "workspace:6.0.0-6-next.28",
"@verdaccio/auth": "workspace:6.0.0-6-next.41",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/logger": "workspace:6.0.0-6-next.30",
"@verdaccio/middleware": "workspace:6.0.0-6-next.41",
"@verdaccio/store": "workspace:6.0.0-6-next.42",
"@verdaccio/utils": "workspace:6.0.0-6-next.30",
"abortcontroller-polyfill": "1.7.5",
"cookies": "0.8.0",
"debug": "4.3.4",
@@ -57,8 +57,8 @@
},
"devDependencies": {
"@types/node": "16.18.10",
"@verdaccio/server": "workspace:6.0.0-6-next.49",
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"@verdaccio/server": "workspace:6.0.0-6-next.51",
"@verdaccio/types": "workspace:11.0.0-6-next.21",
"@verdaccio/test-helper": "workspace:2.0.0-6-next.7",
"supertest": "6.3.3",
"nock": "13.2.9",

View File

@@ -1,5 +1,29 @@
# @verdaccio/auth
## 6.0.0-6-next.41
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/loaders@6.0.0-6-next.31
- @verdaccio/logger@6.0.0-6-next.30
- verdaccio-htpasswd@11.0.0-6-next.32
- @verdaccio/config@6.0.0-6-next.62
- @verdaccio/utils@6.0.0-6-next.30
## 6.0.0-6-next.40
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/config@6.0.0-6-next.61
- @verdaccio/loaders@6.0.0-6-next.30
- verdaccio-htpasswd@11.0.0-6-next.31
- @verdaccio/core@6.0.0-6-next.61
- @verdaccio/utils@6.0.0-6-next.29
- @verdaccio/logger@6.0.0-6-next.29
## 6.0.0-6-next.39
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/auth",
"version": "6.0.0-6-next.39",
"version": "6.0.0-6-next.41",
"description": "logger",
"main": "./build/index.js",
"types": "./build/index.d.ts",
@@ -39,19 +39,19 @@
},
"license": "MIT",
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/loaders": "workspace:6.0.0-6-next.29",
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"@verdaccio/utils": "workspace:6.0.0-6-next.28",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/loaders": "workspace:6.0.0-6-next.31",
"@verdaccio/logger": "workspace:6.0.0-6-next.30",
"@verdaccio/utils": "workspace:6.0.0-6-next.30",
"debug": "4.3.4",
"express": "4.18.2",
"jsonwebtoken": "9.0.0",
"lodash": "4.17.21",
"verdaccio-htpasswd": "workspace:11.0.0-6-next.30"
"verdaccio-htpasswd": "workspace:11.0.0-6-next.32"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.20"
"@verdaccio/types": "workspace:11.0.0-6-next.21"
},
"funding": {
"type": "opencollective",

View File

@@ -1,5 +1,25 @@
# @verdaccio/cli
## 6.0.0-6-next.62
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/logger@6.0.0-6-next.30
- @verdaccio/node-api@6.0.0-6-next.62
- @verdaccio/config@6.0.0-6-next.62
## 6.0.0-6-next.61
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/config@6.0.0-6-next.61
- @verdaccio/node-api@6.0.0-6-next.61
- @verdaccio/core@6.0.0-6-next.61
- @verdaccio/logger@6.0.0-6-next.29
## 6.0.0-6-next.60
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/cli",
"version": "6.0.0-6-next.60",
"version": "6.0.0-6-next.62",
"author": {
"name": "Juan Picado",
"email": "juanpicado19@gmail.com"
@@ -44,11 +44,11 @@
"start": "ts-node src/index.ts"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"@verdaccio/node-api": "workspace:6.0.0-6-next.60",
"clipanion": "3.1.0",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/logger": "workspace:6.0.0-6-next.30",
"@verdaccio/node-api": "workspace:6.0.0-6-next.62",
"clipanion": "3.2.0",
"envinfo": "7.8.1",
"kleur": "3.0.3",
"semver": "7.3.8"

View File

@@ -1,5 +1,24 @@
# @verdaccio/config
## 6.0.0-6-next.62
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/utils@6.0.0-6-next.30
## 6.0.0-6-next.61
### Minor Changes
- d167f92e: chore: rollback yaml dep support old nodejs versions
### Patch Changes
- @verdaccio/core@6.0.0-6-next.61
- @verdaccio/utils@6.0.0-6-next.29
## 6.0.0-6-next.60
### Minor Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/config",
"version": "6.0.0-6-next.60",
"version": "6.0.0-6-next.62",
"description": "logger",
"main": "./build/index.js",
"types": "build/index.d.ts",
@@ -38,10 +38,10 @@
"build": "pnpm run build:js && pnpm run build:types"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/utils": "workspace:6.0.0-6-next.28",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/utils": "workspace:6.0.0-6-next.30",
"debug": "4.3.4",
"yaml": "2.2.0",
"js-yaml": "4.1.0",
"lodash": "4.17.21",
"minimatch": "3.1.2",
"yup": "0.32.11"

View File

@@ -1,7 +1,7 @@
import buildDebug from 'debug';
import fs from 'fs';
import YAML from 'js-yaml';
import { isObject } from 'lodash';
import YAML from 'yaml';
import { APP_ERROR } from '@verdaccio/core';
import { ConfigYaml } from '@verdaccio/types';
@@ -26,7 +26,7 @@ export function parseConfigFile(configPath: string): ConfigYaml & {
debug('parsing config file: %o', configPath);
try {
if (/\.ya?ml$/i.test(configPath)) {
const yamlConfig = YAML.parse(fs.readFileSync(configPath, 'utf8'), {
const yamlConfig = YAML.load(fs.readFileSync(configPath, 'utf8'), {
strict: false,
}) as ConfigYaml;
@@ -56,7 +56,7 @@ export function parseConfigFile(configPath: string): ConfigYaml & {
export function fromJStoYAML(config: Partial<ConfigYaml>): string | null {
debug('convert config from JSON to YAML');
if (isObject(config)) {
return YAML.stringify(config);
return YAML.dump(config);
} else {
throw new Error(`config is not a valid object`);
}

View File

@@ -6,7 +6,7 @@ uplinks:
npmjs:
url: http://localhost:4873/
packages:
"@*/*":
'@*/*':
access: $all
publish: $all
proxy: npmjs
@@ -32,7 +32,7 @@ packages:
access: $authenticated
publish: $authenticated
proxy: npmjs
"*":
'*':
access: $all
publish: $all
proxy: npmjs

View File

@@ -1,5 +1,13 @@
# @verdaccio/core
## 6.0.0-6-next.62
### Patch Changes
- 378e907d: fix(core): fix `isObject` function.`isObject(true)` should return false.
## 6.0.0-6-next.61
## 6.0.0-6-next.60
## 6.0.0-6-next.59

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/core",
"version": "6.0.0-6-next.60",
"version": "6.0.0-6-next.62",
"description": "core utilities",
"keywords": [
"private",
@@ -38,13 +38,13 @@
"semver": "7.3.8",
"ajv": "8.11.2",
"process-warning": "1.0.0",
"core-js": "3.27.0"
"core-js": "3.28.0"
},
"devDependencies": {
"lodash": "4.17.21",
"typedoc": "0.23.23",
"typedoc": "0.23.25",
"typedoc-plugin-missing-exports": "latest",
"@verdaccio/types": "workspace:11.0.0-6-next.20"
"@verdaccio/types": "workspace:11.0.0-6-next.21"
},
"scripts": {
"clean": "rimraf ./build",

View File

@@ -95,14 +95,15 @@ export function normalizeMetadata(manifest: Manifest, name: string): Manifest {
* @return {Boolean}
*/
export function isObject(obj: any): boolean {
if (obj === null || typeof obj === 'undefined' || typeof obj === 'string') {
return false;
}
// if (obj === null || typeof obj === 'undefined' || typeof obj === 'string') {
// return false;
// }
return (
(typeof obj === 'object' || typeof obj.prototype === 'undefined') &&
Array.isArray(obj) === false
);
// return (
// (typeof obj === 'object' || typeof obj.prototype === 'undefined') &&
// Array.isArray(obj) === false
// );
return Object.prototype.toString.call(obj) === '[object Object]';
}
export function validatePassword(

View File

@@ -31,6 +31,7 @@ describe('isObject', () => {
expect(isObject(['foo'])).toBeFalsy();
expect(isObject(null)).toBeFalsy();
expect(isObject(undefined)).toBeFalsy();
expect(isObject(true)).toBeFalsy();
});
});

View File

@@ -39,7 +39,7 @@
"lockfile": "1.0.4"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.20"
"@verdaccio/types": "workspace:11.0.0-6-next.21"
},
"scripts": {
"clean": "rimraf ./build",

View File

@@ -1,5 +1,22 @@
# Change Log
## 11.0.0-6-next.31
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/url@11.0.0-6-next.28
- @verdaccio/utils@6.0.0-6-next.30
## 11.0.0-6-next.30
### Patch Changes
- @verdaccio/core@6.0.0-6-next.61
- @verdaccio/url@11.0.0-6-next.27
- @verdaccio/utils@6.0.0-6-next.29
## 11.0.0-6-next.29
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/tarball",
"version": "11.0.0-6-next.29",
"version": "11.0.0-6-next.31",
"description": "tarball utilities resolver",
"keywords": [
"private",
@@ -34,13 +34,13 @@
},
"dependencies": {
"debug": "4.3.4",
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/url": "workspace:11.0.0-6-next.26",
"@verdaccio/utils": "workspace:6.0.0-6-next.28",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/url": "workspace:11.0.0-6-next.28",
"@verdaccio/utils": "workspace:6.0.0-6-next.30",
"lodash": "4.17.21"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"@verdaccio/types": "workspace:11.0.0-6-next.21",
"node-mocks-http": "1.12.1"
},
"scripts": {

View File

@@ -1,5 +1,11 @@
# Change Log
## 11.0.0-6-next.21
### Patch Changes
- 4fc21146: fix: missing logo on header
## 11.0.0-6-next.20
### Minor Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/types",
"version": "11.0.0-6-next.20",
"version": "11.0.0-6-next.21",
"description": "verdaccio types definitions",
"keywords": [
"private",
@@ -41,7 +41,7 @@
},
"devDependencies": {
"@types/node": "16.18.10",
"typedoc": "0.23.23"
"typedoc": "0.23.25"
},
"typedoc": {
"entryPoint": "./src/types.ts",

View File

@@ -128,7 +128,6 @@ export type TemplateUIOptions = {
base: string;
primaryColor: string;
version?: string;
logoURI?: string;
flags: FlagsConfig;
} & CommonWebConf;

View File

@@ -1,5 +1,18 @@
# Change Log
## 11.0.0-6-next.28
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
## 11.0.0-6-next.27
### Patch Changes
- @verdaccio/core@6.0.0-6-next.61
## 11.0.0-6-next.26
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/url",
"version": "11.0.0-6-next.26",
"version": "11.0.0-6-next.28",
"description": "url utilities resolver",
"keywords": [
"private",
@@ -33,13 +33,13 @@
"access": "public"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"debug": "4.3.4",
"lodash": "4.17.21",
"validator": "13.7.0"
"validator": "13.9.0"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"@verdaccio/types": "workspace:11.0.0-6-next.21",
"node-mocks-http": "1.12.1"
},
"scripts": {

View File

@@ -1,5 +1,20 @@
# @verdaccio/hooks
## 6.0.0-6-next.32
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/logger@6.0.0-6-next.30
## 6.0.0-6-next.31
### Patch Changes
- @verdaccio/core@6.0.0-6-next.61
- @verdaccio/logger@6.0.0-6-next.29
## 6.0.0-6-next.30
### Minor Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/hooks",
"version": "6.0.0-6-next.30",
"version": "6.0.0-6-next.32",
"description": "loaders logic",
"main": "./build/index.js",
"types": "build/index.d.ts",
@@ -29,18 +29,18 @@
"node": ">=16"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"core-js": "3.27.0",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/logger": "workspace:6.0.0-6-next.30",
"core-js": "3.28.0",
"debug": "4.3.4",
"handlebars": "4.7.7",
"undici": "4.16.0"
},
"devDependencies": {
"@types/node": "16.18.10",
"@verdaccio/auth": "workspace:6.0.0-6-next.39",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/types": "workspace:11.0.0-6-next.20"
"@verdaccio/auth": "workspace:6.0.0-6-next.41",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/types": "workspace:11.0.0-6-next.21"
},
"scripts": {
"clean": "rimraf ./build",

View File

@@ -1,5 +1,17 @@
# @verdaccio/loaders
## 6.0.0-6-next.31
### Patch Changes
- @verdaccio/logger@6.0.0-6-next.30
## 6.0.0-6-next.30
### Patch Changes
- @verdaccio/logger@6.0.0-6-next.29
## 6.0.0-6-next.29
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/loaders",
"version": "6.0.0-6-next.29",
"version": "6.0.0-6-next.31",
"description": "loaders logic",
"main": "./build/index.js",
"types": "build/index.d.ts",
@@ -13,14 +13,14 @@
"url": "https://github.com/verdaccio/verdaccio"
},
"dependencies": {
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"@verdaccio/logger": "workspace:6.0.0-6-next.30",
"debug": "4.3.4",
"lodash": "4.17.21"
},
"devDependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/types": "workspace:11.0.0-6-next.21",
"@verdaccio-scope/verdaccio-auth-foo": "0.0.2",
"verdaccio-auth-memory": "workspace:*",
"customprefix-auth": "1.0.0-6-next.0"

View File

@@ -1,5 +1,17 @@
# @verdaccio/logger-7
## 6.0.0-6-next.7
### Patch Changes
- @verdaccio/logger-commons@6.0.0-6-next.30
## 6.0.0-6-next.6
### Patch Changes
- @verdaccio/logger-commons@6.0.0-6-next.29
## 6.0.0-6-next.5
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/logger-7",
"version": "6.0.0-6-next.5",
"version": "6.0.0-6-next.7",
"description": "logger for verdaccio 5.x version",
"main": "./build/index.js",
"types": "./build/index.d.ts",
@@ -38,11 +38,11 @@
"build": "pnpm run build:js && pnpm run build:types"
},
"dependencies": {
"@verdaccio/logger-commons": "workspace:6.0.0-6-next.28",
"@verdaccio/logger-commons": "workspace:6.0.0-6-next.30",
"pino": "7.11.0"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.20"
"@verdaccio/types": "workspace:11.0.0-6-next.21"
},
"funding": {
"type": "opencollective",

View File

@@ -1,5 +1,18 @@
# @verdaccio/logger-commons
## 6.0.0-6-next.30
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
## 6.0.0-6-next.29
### Patch Changes
- @verdaccio/core@6.0.0-6-next.61
## 6.0.0-6-next.28
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/logger-commons",
"version": "6.0.0-6-next.28",
"version": "6.0.0-6-next.30",
"description": "logger",
"main": "./build/index.js",
"types": "./build/index.d.ts",
@@ -38,14 +38,14 @@
"build": "pnpm run build:js && pnpm run build:types"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/logger-prettify": "workspace:6.0.0-6-next.9",
"debug": "4.3.4",
"colorette": "2.0.19"
},
"devDependencies": {
"pino": "8.8.0",
"@verdaccio/types": "workspace:11.0.0-6-next.20"
"pino": "8.10.0",
"@verdaccio/types": "workspace:11.0.0-6-next.21"
},
"funding": {
"type": "opencollective",

View File

@@ -45,7 +45,7 @@
"sonic-boom": "3.2.1"
},
"devDependencies": {
"pino": "8.8.0"
"pino": "8.10.0"
},
"funding": {
"type": "opencollective",

View File

@@ -1,5 +1,17 @@
# @verdaccio/logger
## 6.0.0-6-next.30
### Patch Changes
- @verdaccio/logger-commons@6.0.0-6-next.30
## 6.0.0-6-next.29
### Patch Changes
- @verdaccio/logger-commons@6.0.0-6-next.29
## 6.0.0-6-next.28
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/logger",
"version": "6.0.0-6-next.28",
"version": "6.0.0-6-next.30",
"description": "logger",
"main": "./build/index.js",
"types": "./build/index.d.ts",
@@ -38,11 +38,11 @@
"build": "pnpm run build:js && pnpm run build:types"
},
"dependencies": {
"@verdaccio/logger-commons": "workspace:6.0.0-6-next.28",
"pino": "8.8.0"
"@verdaccio/logger-commons": "workspace:6.0.0-6-next.30",
"pino": "8.10.0"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.20"
"@verdaccio/types": "workspace:11.0.0-6-next.21"
},
"funding": {
"type": "opencollective",

View File

@@ -1,5 +1,26 @@
# @verdaccio/middleware
## 6.0.0-6-next.41
### Patch Changes
- 4fc21146: fix: missing logo on header
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/url@11.0.0-6-next.28
- @verdaccio/config@6.0.0-6-next.62
- @verdaccio/utils@6.0.0-6-next.30
## 6.0.0-6-next.40
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/config@6.0.0-6-next.61
- @verdaccio/core@6.0.0-6-next.61
- @verdaccio/url@11.0.0-6-next.27
- @verdaccio/utils@6.0.0-6-next.29
## 6.0.0-6-next.39
### Minor Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/middleware",
"version": "6.0.0-6-next.39",
"version": "6.0.0-6-next.41",
"description": "express middleware utils",
"main": "./build/index.js",
"types": "build/index.d.ts",
@@ -38,12 +38,12 @@
"build": "pnpm run build:js && pnpm run build:types"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/utils": "workspace:6.0.0-6-next.28",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/url": "workspace:11.0.0-6-next.26",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/utils": "workspace:6.0.0-6-next.30",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/url": "workspace:11.0.0-6-next.28",
"debug": "4.3.4",
"lru-cache": "7.14.1",
"lru-cache": "7.16.1",
"express": "4.18.2",
"lodash": "4.17.21",
"mime": "2.6.0",
@@ -54,7 +54,7 @@
"url": "https://opencollective.com/verdaccio"
},
"devDependencies": {
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"@verdaccio/logger": "workspace:6.0.0-6-next.30",
"body-parser": "1.20.1",
"supertest": "6.3.3"
}

View File

@@ -7,7 +7,7 @@ import { HTTP_STATUS } from '@verdaccio/core';
import { isURLhasValidProtocol } from '@verdaccio/url';
import { setSecurityWebHeaders } from './security';
import renderHTML, { isHTTPProtocol } from './utils/renderHTML';
import renderHTML from './utils/renderHTML';
const debug = buildDebug('verdaccio:web:render');
@@ -31,23 +31,10 @@ export function renderWebMiddleware(config, tokenMiddleware, pluginOptions) {
if (typeof tokenMiddleware === 'function') {
router.use(tokenMiddleware);
}
router.use(setSecurityWebHeaders);
// Logo
let logoURI = config?.web?.logo ?? '';
if (logoURI && !isURLhasValidProtocol(logoURI)) {
// URI related to a local file
// Note: `path.join` will break on Windows, because it transforms `/` to `\`
// Use POSIX version `path.posix.join` instead.
logoURI = path.posix.join('/-/static/', path.basename(logoURI));
router.get(logoURI, function (req, res, next) {
res.sendFile(path.resolve(config.web.logo), sendFileCallback(next));
debug('render static');
});
}
// Static
// 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}`;
@@ -55,13 +42,13 @@ export function renderWebMiddleware(config, tokenMiddleware, pluginOptions) {
res.sendFile(file, sendFileCallback(next));
});
// logo
if (config?.web?.logo && !isHTTPProtocol(config?.web?.logo)) {
// check the origin of the logo
if (config?.web?.logo && !isURLhasValidProtocol(config?.web?.logo)) {
// URI related to a local file
const absoluteLocalFile = path.posix.resolve(config.web.logo);
debug('serve local logo %s', absoluteLocalFile);
try {
// TODO: remove existsSync by async alternative
// TODO: replace existsSync by async alternative
if (
fs.existsSync(absoluteLocalFile) &&
typeof fs.accessSync(absoluteLocalFile, fs.constants.R_OK) === 'undefined'

View File

@@ -6,6 +6,7 @@ import { URL } from 'url';
import { WEB_TITLE } from '@verdaccio/config';
import { HEADERS } from '@verdaccio/core';
import { TemplateUIOptions } from '@verdaccio/types';
import { isURLhasValidProtocol } from '@verdaccio/url';
import { getPublicUrl } from '@verdaccio/url';
import renderTemplate from './template';
@@ -21,20 +22,12 @@ const defaultManifestFiles = {
ico: 'favicon.ico',
};
/**
* Check if URI is starting with "http://", "https://" or "//"
* @param {string} uri
*/
export function isHTTPProtocol(uri: string): boolean {
return /^(https?:)?\/\//.test(uri);
}
export function resolveLogo(config, req) {
const isLocalFile = config?.web?.logo && !isHTTPProtocol(config?.web?.logo);
const isLocalFile = config?.web?.logo && !isURLhasValidProtocol(config?.web?.logo);
if (isLocalFile) {
return `${getPublicUrl(config?.url_prefix, req)}-/static/${path.basename(config?.web?.logo)}`;
} else if (isHTTPProtocol(config?.web?.logo)) {
} else if (isURLhasValidProtocol(config?.web?.logo)) {
return config?.web?.logo;
} else {
return '';
@@ -53,7 +46,7 @@ export default function renderHTML(config, manifest, manifestFiles, req, res) {
const title = config?.web?.title ?? WEB_TITLE;
const login = hasLogin(config);
const scope = config?.web?.scope ?? '';
const logoURI = resolveLogo(config, req);
const logo = resolveLogo(config, req);
const pkgManagers = config?.web?.pkgManagers ?? ['yarn', 'pnpm', 'npm'];
const version = config?.web?.version;
const flags = {
@@ -94,7 +87,7 @@ export default function renderHTML(config, manifest, manifestFiles, req, res) {
base,
primaryColor,
version,
logoURI,
logo,
flags,
login,
pkgManagers,

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -0,0 +1,24 @@
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: './test/config/dark-logo.png'
html_cache: false
url_prefix: /prefix
log: { type: stdout, format: pretty, level: trace }
flags:
changePassword: true

View File

@@ -8,6 +8,7 @@ auth:
web:
title: verdaccio
login: false
html_cache: false
publish:
allow_offline: false

View File

@@ -0,0 +1,24 @@
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:
html_cache: false
url_prefix: /prefix
log: { type: stdout, format: pretty, level: trace }
flags:
changePassword: true

View File

@@ -13,7 +13,8 @@ web:
showDownloadTarball: true
showRaw: true
primary_color: '#ffffff'
logoURI: 'http://logo.org/logo.png'
logo: 'http://logo.org/logo.png'
html_cache: false
url_prefix: /prefix

View File

@@ -0,0 +1,24 @@
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: './does_not_exist/config/dark-logo.png'
html_cache: false
url_prefix: /prefix
log: { type: stdout, format: pretty, level: trace }
flags:
changePassword: true

View File

@@ -37,6 +37,10 @@ describe('test web server', () => {
return new JSDOM(response.text, { runScripts: 'dangerously' });
};
const loadLogo = async (config = 'default-test.yaml', url) => {
return supertest(initializeServer(config)).get(url).expect(HTTP_STATUS.OK);
};
test('should match render set ui properties', async () => {
const {
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
@@ -56,7 +60,7 @@ describe('test web server', () => {
// FIXME: mock these values, avoid random
// base: 'http://127.0.0.1:60864/prefix/',
// version: '6.0.0-6-next.28',
logoURI: '',
logo: 'http://logo.org/logo.png',
flags: { changePassword: true },
login: true,
pkgManagers: ['pnpm', 'yarn'],
@@ -67,6 +71,28 @@ describe('test web server', () => {
);
});
test('should render logo as file', async () => {
const {
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
} = await render('file-logo.yaml');
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logo).toMatch('/prefix/-/static/dark-logo.png');
return loadLogo('file-logo.yaml', '/-/static/dark-logo.png');
});
test('should not render logo as absolute file is wrong', async () => {
const {
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
} = await render('wrong-logo.yaml');
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logo).toEqual('');
});
test('should render not render a logo', async () => {
const {
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
} = await render('no-logo.yaml');
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logo).toEqual('');
});
test.todo('should default title');
test.todo('should need html cache');
});

View File

@@ -1,5 +1,27 @@
# @verdaccio/node-api
## 6.0.0-6-next.62
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/logger@6.0.0-6-next.30
- @verdaccio/server-fastify@6.0.0-6-next.43
- @verdaccio/server@6.0.0-6-next.51
- @verdaccio/config@6.0.0-6-next.62
## 6.0.0-6-next.61
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/config@6.0.0-6-next.61
- @verdaccio/server@6.0.0-6-next.50
- @verdaccio/server-fastify@6.0.0-6-next.42
- @verdaccio/core@6.0.0-6-next.61
- @verdaccio/logger@6.0.0-6-next.29
## 6.0.0-6-next.60
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/node-api",
"version": "6.0.0-6-next.60",
"version": "6.0.0-6-next.62",
"description": "node API",
"main": "build/index.js",
"types": "build/index.d.ts",
@@ -39,18 +39,18 @@
},
"license": "MIT",
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"@verdaccio/server": "workspace:6.0.0-6-next.49",
"@verdaccio/server-fastify": "workspace:6.0.0-6-next.41",
"core-js": "3.27.0",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/logger": "workspace:6.0.0-6-next.30",
"@verdaccio/server": "workspace:6.0.0-6-next.51",
"@verdaccio/server-fastify": "workspace:6.0.0-6-next.43",
"core-js": "3.28.0",
"debug": "4.3.4",
"lodash": "4.17.21"
},
"devDependencies": {
"@types/node": "16.18.10",
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"@verdaccio/types": "workspace:11.0.0-6-next.21",
"jest-mock-process": "1.5.1",
"selfsigned": "1.10.14",
"supertest": "6.3.3"

View File

@@ -1,5 +1,21 @@
# Change Log
## 11.0.0-6-next.25
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
- @verdaccio/config@6.0.0-6-next.62
## 11.0.0-6-next.24
### Patch Changes
- Updated dependencies [d167f92e]
- @verdaccio/config@6.0.0-6-next.61
- @verdaccio/core@6.0.0-6-next.61
## 11.0.0-6-next.23
### Minor Changes

View File

@@ -1,6 +1,6 @@
{
"name": "verdaccio-audit",
"version": "11.0.0-6-next.23",
"version": "11.0.0-6-next.25",
"description": "Verdaccio Middleware plugin to bypass npmjs audit",
"keywords": [
"private",
@@ -30,16 +30,16 @@
"node": ">=12"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/core": "workspace:6.0.0-6-next.62",
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"express": "4.18.2",
"https-proxy-agent": "5.0.1",
"node-fetch": "cjs"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"@verdaccio/auth": "workspace:6.0.0-6-next.39",
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"@verdaccio/types": "workspace:11.0.0-6-next.21",
"@verdaccio/auth": "workspace:6.0.0-6-next.41",
"@verdaccio/logger": "workspace:6.0.0-6-next.30",
"nock": "13.2.9",
"supertest": "6.3.3"
},

View File

@@ -1,5 +1,18 @@
# Change Log
## 11.0.0-6-next.27
### Patch Changes
- Updated dependencies [378e907d]
- @verdaccio/core@6.0.0-6-next.62
## 11.0.0-6-next.26
### Patch Changes
- @verdaccio/core@6.0.0-6-next.61
## 11.0.0-6-next.25
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "verdaccio-auth-memory",
"version": "11.0.0-6-next.25",
"version": "11.0.0-6-next.27",
"description": "Auth plugin for Verdaccio that keeps users in memory",
"keywords": [
"private",
@@ -32,11 +32,11 @@
},
"dependencies": {
"debug": "4.3.4",
"@verdaccio/core": "workspace:6.0.0-6-next.60"
"@verdaccio/core": "workspace:6.0.0-6-next.62"
},
"devDependencies": {
"@verdaccio/config": "workspace:6.0.0-6-next.60",
"@verdaccio/types": "workspace:11.0.0-6-next.20"
"@verdaccio/config": "workspace:6.0.0-6-next.62",
"@verdaccio/types": "workspace:11.0.0-6-next.21"
},
"scripts": {
"clean": "rimraf ./build",

Some files were not shown because too many files have changed in this diff Show More