Compare commits

..

19 Commits

Author SHA1 Message Date
Juan Picado
a931cb6646 chore: update versions (6-next) (#3604)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-02-14 17:35:58 +01:00
dependabot[bot]
7ad320a444 chore(deps): bump marocchino/sticky-pull-request-comment (#3606)
Bumps [marocchino/sticky-pull-request-comment](https://github.com/marocchino/sticky-pull-request-comment) from 2.3.1 to 2.5.0.
- [Release notes](https://github.com/marocchino/sticky-pull-request-comment/releases)
- [Commits](fcf6fe9e4a...3d60a5b2da)

---
updated-dependencies:
- dependency-name: marocchino/sticky-pull-request-comment
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 08:30:56 +01:00
dependabot[bot]
d1e190e067 chore(deps): bump actions/cache from 3.2.4 to 3.2.5 (#3605)
Bumps [actions/cache](https://github.com/actions/cache) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](627f0f41f6...6998d139dd)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 08:30:42 +01:00
dependabot[bot]
ae391a73f1 chore(deps): bump github/codeql-action from 2.2.1 to 2.2.4 (#3607)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.2.1 to 2.2.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](3ebbd71c74...17573ee1cc)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 08:30:29 +01:00
Juan Picado
45c03819e2 refactor: html render middleware improvements (#3603)
* refactor: render middleware

* refactor: render middleware
2023-02-12 20:26:18 +01:00
Juan Picado
1b38fb2d30 improve storage documentation 2023-02-09 20:48:01 +01:00
verdacciobot
ee5e5d55e6 chore: updated static data 2023-02-09 01:02:58 +00:00
dependabot[bot]
a12e825345 chore(deps): bump docker/build-push-action from 2 to 4 (#3597)
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-06 21:57:38 +01:00
dependabot[bot]
d2614d6869 chore(deps): bump actions/cache from 3.2.3 to 3.2.4 (#3598)
Bumps [actions/cache](https://github.com/actions/cache) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](58c146cc91...627f0f41f6)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-06 20:19:17 +01:00
Juan Picado
a8b173abd9 chore: update versions (6-next) (#3595) 2023-02-06 06:19:04 +01:00
verdacciobot
754cb3da42 chore: updated static data 2023-02-06 00:13:41 +00:00
Juan Picado
65f88b826a bump logger packages 2023-02-05 23:24:44 +01:00
Juan Picado
0c8cc7626b chore: update versions (6-next) (#3594)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-02-05 22:26:37 +01:00
Juan Picado
dcb5b9291b bump up @verdaccio/logger-7 2023-02-05 22:19:50 +01:00
Juan Picado
0a6668c060 chore: update versions (6-next) (#3593)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-02-05 21:58:06 +01:00
Juan Picado
fa274ee44d bump up middleware 2023-02-05 21:36:05 +01:00
Juan Picado
ebc0d5a201 update lockfile 2023-02-05 21:27:53 +01:00
Juan Picado
7b8c250869 chore: add missing changeset config 2023-02-05 21:24:25 +01:00
Juan Picado
631abe1ac1 refactor logger module (#3592)
* refactor logger module

* Update index.ts
2023-02-05 21:00:32 +01:00
215 changed files with 2555 additions and 906 deletions

View File

@@ -0,0 +1,25 @@
---
'@verdaccio/api': minor
'@verdaccio/auth': minor
'@verdaccio/cli': minor
'@verdaccio/types': minor
'@verdaccio/hooks': minor
'@verdaccio/loaders': minor
'@verdaccio/middleware': minor
'@verdaccio/node-api': minor
'verdaccio-audit': minor
'verdaccio-auth-memory': minor
'verdaccio-htpasswd': minor
'@verdaccio/local-storage': minor
'@verdaccio/proxy': minor
'@verdaccio/server': minor
'@verdaccio/server-fastify': minor
'@verdaccio/store': minor
'verdaccio': minor
'@verdaccio/web': minor
'@verdaccio/logger': minor
'@verdaccio/logger-7': minor
'@verdaccio/logger-commons': minor
---
feat: refactor logger

View File

@@ -0,0 +1,5 @@
---
'@verdaccio/logger-7': patch
---
bump up @verdaccio/logger-7

View File

@@ -54,7 +54,9 @@
"@verdaccio/e2e-cli-npm9": "1.0.1-6-next.5",
"@verdaccio/e2e-ui": "2.0.0-6-next.3",
"customprefix-auth": "0.0.1",
"@verdaccio/crowdin-translations": "1.0.0"
"@verdaccio/crowdin-translations": "1.0.0",
"@verdaccio/logger-7": "6.0.0-6-next.1",
"@verdaccio/logger-commons": "6.0.0-6-next.25"
},
"changesets": [
"afraid-mice-obey",
@@ -82,7 +84,9 @@
"few-cooks-destroy",
"few-mangos-grow",
"fifty-jars-rest",
"fifty-stingrays-fold",
"fluffy-papayas-lay",
"forty-students-refuse",
"four-ways-try",
"fuzzy-drinks-taste",
"fuzzy-onions-draw",
@@ -137,6 +141,7 @@
"sour-buses-shout",
"sour-maps-live",
"spicy-frogs-press",
"spicy-radios-remain",
"spicy-snakes-sip",
"strange-ladybugs-nail",
"swift-pumpkins-knock",
@@ -149,8 +154,10 @@
"three-pots-sit",
"tiny-seals-join",
"tricky-taxis-watch",
"twelve-crabs-guess",
"two-dolls-check",
"unlucky-hairs-wonder",
"weak-mangos-taste",
"wild-jokes-beam",
"witty-ties-speak"
]

View File

@@ -0,0 +1,9 @@
---
'@verdaccio/logger': patch
'@verdaccio/logger-7': patch
'@verdaccio/logger-commons': patch
'@verdaccio/logger-prettify': patch
'@verdaccio/middleware': patch
---
bump logger packages

View File

@@ -0,0 +1,5 @@
---
'@verdaccio/middleware': patch
---
chore: bumb up package

View File

@@ -0,0 +1,15 @@
---
'@verdaccio/api': minor
'@verdaccio/config': minor
'@verdaccio/types': minor
'@verdaccio/hooks': minor
'@verdaccio/middleware': minor
'verdaccio-audit': minor
'@verdaccio/proxy': minor
'@verdaccio/server': minor
'@verdaccio/store': minor
'@verdaccio/web': minor
'@verdaccio/ui-theme': minor
---
refactor: render html middleware

View File

@@ -32,7 +32,7 @@ jobs:
- name: Install
run: pnpm recursive install --frozen-lockfile --registry http://localhost:4873
- name: Cache .pnpm-store
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -50,7 +50,7 @@ jobs:
node-version-file: '.nvmrc'
- name: Install pnpm
run: npm i pnpm@6.32.15 -g
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -70,7 +70,7 @@ jobs:
node-version-file: '.nvmrc'
- name: Install pnpm
run: npm i pnpm@6.32.15 -g
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -95,7 +95,7 @@ jobs:
node-version: ${{ matrix.node_version }}
- name: Install pnpm
run: npm i pnpm@6.32.15 -g
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -116,7 +116,7 @@ jobs:
node-version-file: '.nvmrc'
- name: Install pnpm
run: npm i pnpm@6.32.15 -g
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}

View File

@@ -43,7 +43,7 @@ jobs:
- name: Install
run: pnpm recursive install --frozen-lockfile --registry http://localhost:4873
- name: Cache .pnpm-store
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -63,7 +63,7 @@ jobs:
run: |
corepack enable
corepack prepare --activate pnpm@6.32.15
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -85,7 +85,7 @@ jobs:
run: |
corepack enable
corepack prepare --activate pnpm@6.32.15
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -112,7 +112,7 @@ jobs:
run: |
corepack enable
corepack prepare --activate pnpm@6.32.15
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -136,7 +136,7 @@ jobs:
run: |
corepack enable
corepack prepare --activate pnpm@6.32.15
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}

View File

@@ -34,7 +34,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # tag=v2
uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # tag=v2
# Override language selection by uncommenting this and choosing your languages
# with:
@@ -42,7 +42,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # tag=v2
uses: github/codeql-action/autobuild@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # tag=v2
# Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
@@ -56,4 +56,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # tag=v2
uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # tag=v2

View File

@@ -45,7 +45,7 @@ jobs:
{{major}}
{{major}}.{{minor}}
- name: Build & Push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile

View File

@@ -29,7 +29,7 @@ jobs:
- name: Install
run: pnpm recursive install --frozen-lockfile --reporter=silence --ignore-scripts --registry http://localhost:4873
- name: Cache .pnpm-store
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}-${{ github.run_id }}-${{ github.sha }}
@@ -46,7 +46,7 @@ jobs:
node-version-file: '.nvmrc'
- name: Install pnpm
run: npm i pnpm@6.32.15 -g
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}-${{ github.run_id }}-${{ github.sha }}
@@ -55,7 +55,7 @@ jobs:
- name: build
run: pnpm build
- name: Cache packages
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
id: cache-packages
with:
path: ./packages/
@@ -86,13 +86,13 @@ jobs:
node-version: ${{ matrix.node }}
- name: Install pnpm
run: npm i pnpm@6.32.15 -g
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ~/.pnpm-store
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}-${{ github.run_id }}-${{ github.sha }}
- name: Install
run: pnpm recursive install --offline --frozen-lockfile --reporter=silence --ignore-scripts --registry http://localhost:4873
- uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
- uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: ./packages/
key: pkg-${{ hashFiles('pnpm-lock.yaml') }}-${{ github.run_id }}-${{ github.sha }}

View File

@@ -35,7 +35,7 @@ jobs:
node-version-file: '.nvmrc'
- name: Cache pnpm modules
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
env:
cache-name: cache-pnpm-modules
with:

View File

@@ -31,7 +31,7 @@ jobs:
node-version: 16
- name: Cache pnpm modules
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
env:
cache-name: cache-pnpm-modules
with:
@@ -51,7 +51,7 @@ jobs:
- name: Build Translations percentage
run: pnpm build --filter "@verdaccio/crowdin-translations"
- name: Cache Docusaurus Build
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3
with:
path: website/node_modules/.cache/webpack
key: cache/webpack-${{github.ref}}-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -134,7 +134,7 @@ jobs:
- name: Add comment to PR
if: github.repository == 'verdaccio/verdaccio'
id: comment_to_pr
uses: marocchino/sticky-pull-request-comment@fcf6fe9e4a0409cd9316a5011435be0f3327f1e1 # tag=v2
uses: marocchino/sticky-pull-request-comment@3d60a5b2dae89d44e0c6ddc69dd7536aec2071cd # tag=v2
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
number: ${{ github.event.issue.number }}

View File

@@ -5,10 +5,10 @@
"main": "./build/index.js",
"types": "./build/index.d.ts",
"devDependencies": {
"verdaccio": "workspace:6.0.0-6-next.57",
"@verdaccio/core": "workspace:6.0.0-6-next.57",
"@verdaccio/config": "workspace:6.0.0-6-next.57",
"@verdaccio/types": "workspace:11.0.0-6-next.19",
"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",
"debug": "4.3.4",
"fs-extra": "10.1.0",

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.57",
"@verdaccio/core": "workspace:6.0.0-6-next.57",
"@verdaccio/config": "workspace:6.0.0-6-next.57",
"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/test-helper": "workspace:2.0.0-6-next.7",
"debug": "4.3.4",
"cypress": "11.2.0"

View File

@@ -1,5 +1,48 @@
# @verdaccio/api
## 6.0.0-6-next.43
### Minor Changes
- 45c03819: refactor: render html middleware
### Patch Changes
- Updated dependencies [45c03819]
- @verdaccio/config@6.0.0-6-next.60
- @verdaccio/middleware@6.0.0-6-next.39
- @verdaccio/store@6.0.0-6-next.40
- @verdaccio/auth@6.0.0-6-next.39
- @verdaccio/core@6.0.0-6-next.60
- @verdaccio/logger@6.0.0-6-next.28
- @verdaccio/utils@6.0.0-6-next.28
## 6.0.0-6-next.42
### Patch Changes
- Updated dependencies [65f88b82]
- @verdaccio/logger@6.0.0-6-next.27
- @verdaccio/middleware@6.0.0-6-next.38
- @verdaccio/auth@6.0.0-6-next.38
- @verdaccio/store@6.0.0-6-next.39
- @verdaccio/core@6.0.0-6-next.59
- @verdaccio/config@6.0.0-6-next.59
- @verdaccio/utils@6.0.0-6-next.27
## 6.0.0-6-next.41
### Patch Changes
- Updated dependencies [fa274ee4]
- @verdaccio/middleware@6.0.0-6-next.37
- @verdaccio/core@6.0.0-6-next.58
- @verdaccio/config@6.0.0-6-next.58
- @verdaccio/auth@6.0.0-6-next.37
- @verdaccio/store@6.0.0-6-next.38
- @verdaccio/utils@6.0.0-6-next.26
- @verdaccio/logger@6.0.0-6-next.26
## 6.0.0-6-next.40
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/api",
"version": "6.0.0-6-next.40",
"version": "6.0.0-6-next.43",
"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.36",
"@verdaccio/config": "workspace:6.0.0-6-next.57",
"@verdaccio/core": "workspace:6.0.0-6-next.57",
"@verdaccio/logger": "workspace:6.0.0-6-next.25",
"@verdaccio/middleware": "workspace:6.0.0-6-next.36",
"@verdaccio/store": "workspace:6.0.0-6-next.37",
"@verdaccio/utils": "workspace:6.0.0-6-next.25",
"@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",
"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.46",
"@verdaccio/types": "workspace:11.0.0-6-next.19",
"@verdaccio/server": "workspace:6.0.0-6-next.49",
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"@verdaccio/test-helper": "workspace:2.0.0-6-next.7",
"supertest": "6.3.3",
"nock": "13.2.9",

View File

@@ -4,13 +4,17 @@ import mime from 'mime';
import { Auth } from '@verdaccio/auth';
import { constants, errorUtils } from '@verdaccio/core';
import { logger } from '@verdaccio/logger';
import { allow, media } from '@verdaccio/middleware';
import { Storage } from '@verdaccio/store';
import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';
export default function (route: Router, auth: Auth, storage: Storage): void {
const can = allow(auth);
const can = allow(auth, {
beforeAll: (a, b) => logger.trace(a, b),
afterAll: (a, b) => logger.trace(a, b),
});
const addTagPackageVersionMiddleware = async function (
req: $RequestExtend,
res: $ResponseExtend,

View File

@@ -3,6 +3,7 @@ import { Router } from 'express';
import { Auth } from '@verdaccio/auth';
import { HEADERS, HEADER_TYPE, stringUtils } from '@verdaccio/core';
import { logger } from '@verdaccio/logger';
import { allow } from '@verdaccio/middleware';
import { Storage } from '@verdaccio/store';
@@ -11,8 +12,10 @@ import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/cust
const debug = buildDebug('verdaccio:api:package');
export default function (route: Router, auth: Auth, storage: Storage): void {
const can = allow(auth);
const can = allow(auth, {
beforeAll: (a, b) => logger.trace(a, b),
afterAll: (a, b) => logger.trace(a, b),
});
route.get(
'/:package/:version?',
can('access'),

View File

@@ -93,7 +93,10 @@ const debug = buildDebug('verdaccio:api:publish');
*
*/
export default function publish(router: Router, auth: Auth, storage: Storage): void {
const can = allow(auth);
const can = allow(auth, {
beforeAll: (a, b) => logger.trace(a, b),
afterAll: (a, b) => logger.trace(a, b),
});
router.put(
'/:package',
can('publish'),

View File

@@ -13,6 +13,7 @@ import {
validatioUtils,
} from '@verdaccio/core';
import { logger } from '@verdaccio/logger';
import { rateLimit } from '@verdaccio/middleware';
import { Config, RemoteUser } from '@verdaccio/types';
import { getAuthenticatedMessage, mask } from '@verdaccio/utils';
@@ -23,6 +24,7 @@ const debug = buildDebug('verdaccio:api:user');
export default function (route: Router, auth: Auth, config: Config): void {
route.get(
'/-/user/:org_couchdb_user',
rateLimit(config?.userRateLimit),
function (req: $RequestExtend, res: Response, next: $NextFunctionVer): void {
debug('verifying user');
const message = getAuthenticatedMessage(req.remote_user.name);
@@ -53,6 +55,7 @@ export default function (route: Router, auth: Auth, config: Config): void {
*/
route.put(
'/-/user/:org_couchdb_user/:_rev?/:revision?',
rateLimit(config?.userRateLimit),
function (req: $RequestExtend, res: Response, next: $NextFunctionVer): void {
const { name, password } = req.body;
debug('login or adduser');

View File

@@ -10,6 +10,7 @@ import {
errorUtils,
validatioUtils,
} from '@verdaccio/core';
import { rateLimit } from '@verdaccio/middleware';
import { Config } from '@verdaccio/types';
import { $NextFunctionVer, $RequestExtend } from '../../types/custom';
@@ -41,6 +42,7 @@ export default function (route: Router, auth: Auth, config: Config): void {
route.get(
'/-/npm/v1/user',
rateLimit(config?.userRateLimit),
function (req: $RequestExtend, res: Response, next: $NextFunctionVer): void {
if (_.isNil(req.remote_user.name) === false) {
return next(buildProfile(req.remote_user.name));
@@ -55,6 +57,7 @@ export default function (route: Router, auth: Auth, config: Config): void {
route.post(
'/-/npm/v1/user',
rateLimit(config?.userRateLimit),
function (req: $RequestExtend, res: Response, next: $NextFunctionVer): void {
if (_.isNil(req.remote_user.name)) {
res.status(HTTP_STATUS.UNAUTHORIZED);

View File

@@ -5,6 +5,7 @@ import { getApiToken } from '@verdaccio/auth';
import { Auth } from '@verdaccio/auth';
import { HEADERS, HTTP_STATUS, SUPPORT_ERRORS, errorUtils } from '@verdaccio/core';
import { logger } from '@verdaccio/logger';
import { rateLimit } from '@verdaccio/middleware';
import { Storage } from '@verdaccio/store';
import { Config, RemoteUser, Token } from '@verdaccio/types';
import { mask, stringToMD5 } from '@verdaccio/utils';
@@ -26,6 +27,7 @@ function normalizeToken(token: Token): NormalizeToken {
export default function (route: Router, auth: Auth, storage: Storage, config: Config): void {
route.get(
'/-/npm/v1/tokens',
rateLimit(config?.userRateLimit),
async function (req: $RequestExtend, res: Response, next: $NextFunctionVer) {
const { name } = req.remote_user;
@@ -53,6 +55,7 @@ export default function (route: Router, auth: Auth, storage: Storage, config: Co
route.post(
'/-/npm/v1/tokens',
rateLimit(config?.userRateLimit),
function (req: $RequestExtend, res: Response, next: $NextFunctionVer) {
const { password, readonly, cidr_whitelist } = req.body;
const { name } = req.remote_user;
@@ -123,6 +126,7 @@ export default function (route: Router, auth: Auth, storage: Storage, config: Co
route.delete(
'/-/npm/v1/tokens/token/:tokenKey',
rateLimit(config?.userRateLimit),
async (req: $RequestExtend, res: Response, next: $NextFunctionVer) => {
const {
params: { tokenKey },

View File

@@ -23,7 +23,7 @@
"path": "../hooks"
},
{
"path": "../logger"
"path": "../logger/logger"
},
{
"path": "../middleware"

View File

@@ -1,5 +1,40 @@
# @verdaccio/auth
## 6.0.0-6-next.39
### Patch Changes
- Updated dependencies [45c03819]
- @verdaccio/config@6.0.0-6-next.60
- @verdaccio/loaders@6.0.0-6-next.29
- verdaccio-htpasswd@11.0.0-6-next.30
- @verdaccio/core@6.0.0-6-next.60
- @verdaccio/logger@6.0.0-6-next.28
- @verdaccio/utils@6.0.0-6-next.28
## 6.0.0-6-next.38
### Patch Changes
- Updated dependencies [65f88b82]
- @verdaccio/logger@6.0.0-6-next.27
- @verdaccio/loaders@6.0.0-6-next.28
- verdaccio-htpasswd@11.0.0-6-next.29
- @verdaccio/core@6.0.0-6-next.59
- @verdaccio/config@6.0.0-6-next.59
- @verdaccio/utils@6.0.0-6-next.27
## 6.0.0-6-next.37
### Patch Changes
- @verdaccio/core@6.0.0-6-next.58
- @verdaccio/config@6.0.0-6-next.58
- @verdaccio/loaders@6.0.0-6-next.27
- verdaccio-htpasswd@11.0.0-6-next.28
- @verdaccio/utils@6.0.0-6-next.26
- @verdaccio/logger@6.0.0-6-next.26
## 6.0.0-6-next.36
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/auth",
"version": "6.0.0-6-next.36",
"version": "6.0.0-6-next.39",
"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.57",
"@verdaccio/config": "workspace:6.0.0-6-next.57",
"@verdaccio/loaders": "workspace:6.0.0-6-next.26",
"@verdaccio/logger": "workspace:6.0.0-6-next.25",
"@verdaccio/utils": "workspace:6.0.0-6-next.25",
"@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",
"debug": "4.3.4",
"express": "4.18.2",
"jsonwebtoken": "9.0.0",
"lodash": "4.17.21",
"verdaccio-htpasswd": "workspace:11.0.0-6-next.27"
"verdaccio-htpasswd": "workspace:11.0.0-6-next.30"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.19"
"@verdaccio/types": "workspace:11.0.0-6-next.20"
},
"funding": {
"type": "opencollective",

View File

@@ -20,7 +20,7 @@
"path": "../loaders"
},
{
"path": "../logger"
"path": "../logger/logger"
},
{
"path": "../utils"

View File

@@ -1,5 +1,34 @@
# @verdaccio/cli
## 6.0.0-6-next.60
### Patch Changes
- Updated dependencies [45c03819]
- @verdaccio/config@6.0.0-6-next.60
- @verdaccio/node-api@6.0.0-6-next.60
- @verdaccio/core@6.0.0-6-next.60
- @verdaccio/logger@6.0.0-6-next.28
## 6.0.0-6-next.59
### Patch Changes
- Updated dependencies [65f88b82]
- @verdaccio/logger@6.0.0-6-next.27
- @verdaccio/node-api@6.0.0-6-next.59
- @verdaccio/core@6.0.0-6-next.59
- @verdaccio/config@6.0.0-6-next.59
## 6.0.0-6-next.58
### Patch Changes
- @verdaccio/node-api@6.0.0-6-next.58
- @verdaccio/core@6.0.0-6-next.58
- @verdaccio/config@6.0.0-6-next.58
- @verdaccio/logger@6.0.0-6-next.26
## 6.0.0-6-next.57
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/cli",
"version": "6.0.0-6-next.57",
"version": "6.0.0-6-next.60",
"author": {
"name": "Juan Picado",
"email": "juanpicado19@gmail.com"
@@ -44,10 +44,10 @@
"start": "ts-node src/index.ts"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.57",
"@verdaccio/config": "workspace:6.0.0-6-next.57",
"@verdaccio/logger": "workspace:6.0.0-6-next.25",
"@verdaccio/node-api": "workspace:6.0.0-6-next.57",
"@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",
"envinfo": "7.8.1",
"kleur": "3.0.3",

View File

@@ -20,7 +20,7 @@
"path": "../node-api"
},
{
"path": "../logger"
"path": "../logger/logger"
}
]
}

View File

@@ -1,5 +1,30 @@
# @verdaccio/config
## 6.0.0-6-next.60
### Minor Changes
- 45c03819: refactor: render html middleware
### Patch Changes
- @verdaccio/core@6.0.0-6-next.60
- @verdaccio/utils@6.0.0-6-next.28
## 6.0.0-6-next.59
### Patch Changes
- @verdaccio/core@6.0.0-6-next.59
- @verdaccio/utils@6.0.0-6-next.27
## 6.0.0-6-next.58
### Patch Changes
- @verdaccio/core@6.0.0-6-next.58
- @verdaccio/utils@6.0.0-6-next.26
## 6.0.0-6-next.57
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/config",
"version": "6.0.0-6-next.57",
"version": "6.0.0-6-next.60",
"description": "logger",
"main": "./build/index.js",
"types": "build/index.d.ts",
@@ -38,8 +38,8 @@
"build": "pnpm run build:js && pnpm run build:types"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.57",
"@verdaccio/utils": "workspace:6.0.0-6-next.25",
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/utils": "workspace:6.0.0-6-next.28",
"debug": "4.3.4",
"yaml": "2.2.0",
"lodash": "4.17.21",

View File

@@ -1,5 +1,17 @@
const pkgVersion = require('../package.json').version;
import _ from 'lodash';
export function getUserAgent(): string {
return `verdaccio/${pkgVersion}`;
export function getUserAgent(
customUserAgent?: boolean | string,
version?: string,
name?: string
): string {
if (customUserAgent === true) {
return `${name}/${version}`;
} else if (_.isString(customUserAgent) && _.isEmpty(customUserAgent) === false) {
return customUserAgent;
} else if (customUserAgent === false) {
return 'hidden';
}
return `${name}/${version}`;
}

View File

@@ -10,6 +10,7 @@ import {
FlagsConfig,
PackageAccess,
PackageList,
RateLimit,
Security,
ServerSettingsConf,
} from '@verdaccio/types';
@@ -28,11 +29,17 @@ const debug = buildDebug('verdaccio:config');
export const WEB_TITLE = 'Verdaccio';
// we limit max 1000 request per 15 minutes on user endpoints
export const defaultUserRateLimiting = {
windowMs: 15 * 60 * 1000, // 15 minutes
max: 1000,
};
/**
* Coordinates the application configuration
*/
class Config implements AppConfig {
public user_agent: string;
public user_agent: string | undefined;
public uplinks: any;
public packages: PackageList;
public users: any;
@@ -49,7 +56,7 @@ class Config implements AppConfig {
// @ts-ignore
public secret: string;
public flags: FlagsConfig;
public userRateLimit: RateLimit;
public constructor(config: ConfigYaml & { config_path: string }) {
const self = this;
this.storage = process.env.VERDACCIO_STORAGE_PATH || config.storage;
@@ -65,6 +72,7 @@ class Config implements AppConfig {
this.flags = {
searchRemote: config.flags?.searchRemote ?? true,
};
this.user_agent = config.user_agent;
for (const configProp in config) {
if (self[configProp] == null) {
@@ -72,11 +80,14 @@ class Config implements AppConfig {
}
}
// @ts-ignore
if (_.isNil(this.user_agent)) {
this.user_agent = getUserAgent();
if (typeof this.user_agent === 'undefined') {
// by default user agent is hidden
debug('set default user agent');
this.user_agent = getUserAgent(false);
}
this.userRateLimit = { ...defaultUserRateLimiting, ...config?.userRateLimit };
// some weird shell scripts are valid yaml files parsed as string
assert(_.isObject(config), APP_ERROR.CONFIG_NOT_VALID);

View File

@@ -5,6 +5,7 @@ export * from './package-access';
export { fromJStoYAML, parseConfigFile } from './parse';
export * from './uplinks';
export * from './security';
export * from './agent';
export * from './user';
export { default as ConfigBuilder } from './builder';
export { getDefaultConfig } from './conf';

View File

@@ -1,5 +1,11 @@
# @verdaccio/core
## 6.0.0-6-next.60
## 6.0.0-6-next.59
## 6.0.0-6-next.58
## 6.0.0-6-next.57
## 6.0.0-6-next.56

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/core",
"version": "6.0.0-6-next.57",
"version": "6.0.0-6-next.60",
"description": "core utilities",
"keywords": [
"private",
@@ -44,7 +44,7 @@
"lodash": "4.17.21",
"typedoc": "0.23.23",
"typedoc-plugin-missing-exports": "latest",
"@verdaccio/types": "workspace:11.0.0-6-next.19"
"@verdaccio/types": "workspace:11.0.0-6-next.20"
},
"scripts": {
"clean": "rimraf ./build",

View File

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

View File

@@ -1,5 +1,29 @@
# Change Log
## 11.0.0-6-next.29
### Patch Changes
- @verdaccio/core@6.0.0-6-next.60
- @verdaccio/url@11.0.0-6-next.26
- @verdaccio/utils@6.0.0-6-next.28
## 11.0.0-6-next.28
### Patch Changes
- @verdaccio/core@6.0.0-6-next.59
- @verdaccio/url@11.0.0-6-next.25
- @verdaccio/utils@6.0.0-6-next.27
## 11.0.0-6-next.27
### Patch Changes
- @verdaccio/core@6.0.0-6-next.58
- @verdaccio/url@11.0.0-6-next.24
- @verdaccio/utils@6.0.0-6-next.26
## 11.0.0-6-next.26
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/tarball",
"version": "11.0.0-6-next.26",
"version": "11.0.0-6-next.29",
"description": "tarball utilities resolver",
"keywords": [
"private",
@@ -34,13 +34,13 @@
},
"dependencies": {
"debug": "4.3.4",
"@verdaccio/core": "workspace:6.0.0-6-next.57",
"@verdaccio/url": "workspace:11.0.0-6-next.23",
"@verdaccio/utils": "workspace:6.0.0-6-next.25",
"@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",
"lodash": "4.17.21"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.19",
"@verdaccio/types": "workspace:11.0.0-6-next.20",
"node-mocks-http": "1.12.1"
},
"scripts": {

View File

@@ -1,5 +1,11 @@
# Change Log
## 11.0.0-6-next.20
### Minor Changes
- 45c03819: refactor: render html middleware
## 11.0.0-6-next.19
### Minor Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/types",
"version": "11.0.0-6-next.19",
"version": "11.0.0-6-next.20",
"description": "verdaccio types definitions",
"keywords": [
"private",

View File

@@ -1,4 +1,4 @@
import { PackageAccess, PackageList } from './manifest';
import { PackageAccess, PackageList } from '@verdaccio/types/src/manifest';
export type TypeToken = 'Bearer' | 'Basic';
@@ -252,6 +252,7 @@ export interface ConfigYaml {
store?: any;
listen?: ListenAddress;
https?: HttpsConf;
user_agent?: string;
http_proxy?: string;
plugins?: string | void | null;
https_proxy?: string;
@@ -264,6 +265,7 @@ export interface ConfigYaml {
url_prefix?: string;
server?: ServerSettingsConf;
flags?: FlagsConfig;
userRateLimit?: RateLimit;
// internal objects, added by internal yaml to JS config parser
// @deprecated use configPath instead
config_path?: string;
@@ -277,7 +279,6 @@ export interface ConfigYaml {
* @extends {ConfigYaml}
*/
export interface Config extends Omit<ConfigYaml, 'packages' | 'security' | 'configPath'> {
user_agent: string;
server_id: string;
secret: string;
// save the configuration file path, it's fails without thi configPath

View File

@@ -1 +1 @@
export * from './storage';
export * from '@verdaccio/types/src/plugins/storage';

View File

@@ -1,5 +1,5 @@
import { Callback, CallbackAction } from '../commons';
import { Manifest, Token } from '../manifest';
import { Callback, CallbackAction } from '@verdaccio/types/src/commons';
import { Manifest, Token } from '@verdaccio/types/src/manifest';
export type StorageList = string[];

View File

@@ -1,5 +1,5 @@
export * from './plugins';
export * from './manifest';
export * from './search';
export * from './commons';
export * from './configuration';
export * from '@verdaccio/types/src/plugins';
export * from '@verdaccio/types/src/manifest';
export * from '@verdaccio/types/src/search';
export * from '@verdaccio/types/src/commons';
export * from '@verdaccio/types/src/configuration';

View File

@@ -1,5 +1,23 @@
# Change Log
## 11.0.0-6-next.26
### Patch Changes
- @verdaccio/core@6.0.0-6-next.60
## 11.0.0-6-next.25
### Patch Changes
- @verdaccio/core@6.0.0-6-next.59
## 11.0.0-6-next.24
### Patch Changes
- @verdaccio/core@6.0.0-6-next.58
## 11.0.0-6-next.23
### Patch Changes

View File

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

View File

@@ -1,5 +1,31 @@
# @verdaccio/hooks
## 6.0.0-6-next.30
### Minor Changes
- 45c03819: refactor: render html middleware
### Patch Changes
- @verdaccio/core@6.0.0-6-next.60
- @verdaccio/logger@6.0.0-6-next.28
## 6.0.0-6-next.29
### Patch Changes
- Updated dependencies [65f88b82]
- @verdaccio/logger@6.0.0-6-next.27
- @verdaccio/core@6.0.0-6-next.59
## 6.0.0-6-next.28
### Patch Changes
- @verdaccio/core@6.0.0-6-next.58
- @verdaccio/logger@6.0.0-6-next.26
## 6.0.0-6-next.27
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/hooks",
"version": "6.0.0-6-next.27",
"version": "6.0.0-6-next.30",
"description": "loaders logic",
"main": "./build/index.js",
"types": "build/index.d.ts",
@@ -29,8 +29,8 @@
"node": ">=16"
},
"dependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.57",
"@verdaccio/logger": "workspace:6.0.0-6-next.25",
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"core-js": "3.27.0",
"debug": "4.3.4",
"handlebars": "4.7.7",
@@ -38,9 +38,9 @@
},
"devDependencies": {
"@types/node": "16.18.10",
"@verdaccio/auth": "workspace:6.0.0-6-next.36",
"@verdaccio/config": "workspace:6.0.0-6-next.57",
"@verdaccio/types": "workspace:11.0.0-6-next.19"
"@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"
},
"scripts": {
"clean": "rimraf ./build",

View File

@@ -15,7 +15,7 @@ const singleHeaderNotificationConfig = parseConfigFile(
);
const multiNotificationConfig = parseConfigFile(parseConfigurationNotifyFile('multiple.notify'));
setup([]);
setup({});
const domain = 'http://slack-service';

View File

@@ -14,7 +14,7 @@
"path": "../config"
},
{
"path": "../logger"
"path": "../logger/logger"
}
]
}

View File

@@ -1,5 +1,24 @@
# @verdaccio/loaders
## 6.0.0-6-next.29
### Patch Changes
- @verdaccio/logger@6.0.0-6-next.28
## 6.0.0-6-next.28
### Patch Changes
- Updated dependencies [65f88b82]
- @verdaccio/logger@6.0.0-6-next.27
## 6.0.0-6-next.27
### Patch Changes
- @verdaccio/logger@6.0.0-6-next.26
## 6.0.0-6-next.26
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/loaders",
"version": "6.0.0-6-next.26",
"version": "6.0.0-6-next.29",
"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.25",
"@verdaccio/logger": "workspace:6.0.0-6-next.28",
"debug": "4.3.4",
"lodash": "4.17.21"
},
"devDependencies": {
"@verdaccio/core": "workspace:6.0.0-6-next.57",
"@verdaccio/config": "workspace:6.0.0-6-next.57",
"@verdaccio/types": "workspace:11.0.0-6-next.19",
"@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-scope/verdaccio-auth-foo": "0.0.2",
"verdaccio-auth-memory": "workspace:*",
"customprefix-auth": "1.0.0-6-next.0"

View File

@@ -80,7 +80,9 @@ export async function asyncLoadPlugin<T extends pluginUtils.Plugin<T>>(
await isDirectory(pluginsPath);
const pluginDir = pluginsPath;
const externalFilePlugin = resolve(pluginDir, `${prefix}-${pluginId}`);
let plugin = tryLoad<T>(externalFilePlugin);
let plugin = tryLoad<T>(externalFilePlugin, (a: any, b: any) => {
logger.error(a, b);
});
if (plugin && isValid(plugin)) {
plugin = executePlugin(plugin, pluginConfigs[pluginId], params);
if (!sanityCheck(plugin)) {
@@ -106,7 +108,9 @@ export async function asyncLoadPlugin<T extends pluginUtils.Plugin<T>>(
debug('is scoped plugin %s', isScoped);
const pluginName = isScoped ? pluginId : `${prefix}-${pluginId}`;
debug('plugin pkg name %s', pluginName);
let plugin = tryLoad<T>(pluginName);
let plugin = tryLoad<T>(pluginName, (a: any, b: any) => {
logger.error(a, b);
});
if (plugin && isValid(plugin)) {
plugin = executePlugin(plugin, pluginConfigs[pluginId], params);
if (!sanityCheck(plugin)) {

View File

@@ -2,7 +2,6 @@ import buildDebug from 'debug';
import _ from 'lodash';
import { pluginUtils } from '@verdaccio/core';
import { logger } from '@verdaccio/logger';
const debug = buildDebug('verdaccio:plugin:loader:utils');
const MODULE_NOT_FOUND = 'MODULE_NOT_FOUND';
@@ -23,7 +22,7 @@ export function isES6<T>(plugin: PluginType<T>): boolean {
* @param {*} path the module's path
* @return {Object}
*/
export function tryLoad<T>(path: string): PluginType<T> | null {
export function tryLoad<T>(path: string, onError: any): PluginType<T> | null {
try {
debug('loading plugin %s', path);
return require(path) as PluginType<T>;
@@ -32,7 +31,7 @@ export function tryLoad<T>(path: string): PluginType<T> | null {
debug('plugin %s not found', path);
return null;
}
logger.error({ err: err.msg }, 'error loading plugin @{err}');
onError({ err: err.msg }, 'error loading plugin @{err}');
throw err;
}
}

View File

@@ -15,7 +15,7 @@
"path": "../core/core"
},
{
"path": "../logger"
"path": "../logger/logger"
}
]
}

View File

@@ -1,3 +0,0 @@
{
"extends": "../../.babelrc"
}

View File

@@ -1,3 +0,0 @@
{
"extends": "../../.babelrc"
}

View File

@@ -0,0 +1,14 @@
{
"extends": "../../../.babelrc",
"presets": [
[
"@babel/env",
{
"targets": {
"node": 12
}
}
],
"@babel/typescript"
]
}

View File

@@ -0,0 +1,27 @@
# @verdaccio/logger-7
## 6.0.0-6-next.5
### Patch Changes
- @verdaccio/logger-commons@6.0.0-6-next.28
## 6.0.0-6-next.4
### Patch Changes
- 65f88b82: bump logger packages
- Updated dependencies [65f88b82]
- @verdaccio/logger-commons@6.0.0-6-next.27
## 6.0.0-6-next.3
### Patch Changes
- dcb5b929: bump up @verdaccio/logger-7
## 6.0.0-6-next.2
### Patch Changes
- @verdaccio/logger-commons@6.0.0-6-next.26

View File

@@ -0,0 +1,12 @@
# @verdaccio/logger-7
[![backers](https://opencollective.com/verdaccio/tiers/backer/badge.svg?label=Backer&color=brightgreen)](https://opencollective.com/verdaccio)
[![stackshare](https://img.shields.io/badge/Follow%20on-StackShare-blue.svg?logo=stackshare&style=flat)](https://stackshare.io/verdaccio)
[![MIT](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/verdaccio/verdaccio/blob/master/LICENSE)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/verdaccio/localized.svg)](https://crowdin.com/project/verdaccio)
[![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/verdaccio/verdaccio)](https://www.tickgit.com/browse?repo=github.com/verdaccio/verdaccio)
[![Twitter followers](https://img.shields.io/twitter/follow/verdaccio_npm.svg?style=social&label=Follow)](https://twitter.com/verdaccio_npm)
[![Github](https://img.shields.io/github/stars/verdaccio/verdaccio.svg?style=social&label=Stars)](https://github.com/verdaccio/verdaccio/stargazers)
Special version of `verdaccio` logger for verdaccio 5.x versions.

View File

@@ -1,4 +1,4 @@
const config = require('../../jest/config');
const config = require('../../../jest/config');
module.exports = Object.assign({}, config, {
coverageThreshold: {

View File

@@ -0,0 +1,51 @@
{
"name": "@verdaccio/logger-7",
"version": "6.0.0-6-next.5",
"description": "logger for verdaccio 5.x version",
"main": "./build/index.js",
"types": "./build/index.d.ts",
"author": {
"name": "Juan Picado",
"email": "juanpicado19@gmail.com"
},
"repository": {
"type": "https",
"url": "https://github.com/verdaccio/verdaccio"
},
"license": "MIT",
"homepage": "https://verdaccio.org",
"keywords": [
"private",
"package",
"repository",
"registry",
"enterprise",
"modules",
"proxy",
"server",
"verdaccio"
],
"engines": {
"node": ">=12"
},
"scripts": {
"clean": "rimraf ./build",
"test": "echo 1",
"type-check": "tsc --noEmit -p tsconfig.build.json",
"build:types": "tsc --emitDeclarationOnly -p tsconfig.build.json",
"build:js": "babel src/ --out-dir build/ --copy-files --extensions \".ts,.tsx\" --source-maps",
"watch": "pnpm build:js -- --watch",
"build": "pnpm run build:js && pnpm run build:types"
},
"dependencies": {
"@verdaccio/logger-commons": "workspace:6.0.0-6-next.28",
"pino": "7.11.0"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.20"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/verdaccio"
}
}

View File

@@ -0,0 +1,24 @@
import pino from 'pino';
import { prepareSetup } from '@verdaccio/logger-commons';
import { Logger, LoggerFormat, LoggerType } from '@verdaccio/types';
let logger: Logger;
export type LoggerConfigItem = {
type?: LoggerType;
format?: LoggerFormat;
path?: string;
level?: string;
colors?: boolean;
async?: boolean;
};
export function setup(options: LoggerConfigItem) {
if (typeof logger !== 'undefined') {
return logger;
}
logger = prepareSetup(options, pino);
return logger;
}

View File

@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base",
"extends": "../../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./build"

View File

@@ -0,0 +1,16 @@
{
"extends": "../../../tsconfig.reference.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./build"
},
"include": ["src/**/*.ts"],
"references": [
{
"path": "../logger-prettify"
},
{
"path": "../logger-commons"
}
]
}

View File

@@ -0,0 +1,14 @@
{
"extends": "../../../.babelrc",
"presets": [
[
"@babel/env",
{
"targets": {
"node": 12
}
}
],
"@babel/typescript"
]
}

View File

@@ -0,0 +1,22 @@
# @verdaccio/logger-commons
## 6.0.0-6-next.28
### Patch Changes
- @verdaccio/core@6.0.0-6-next.60
## 6.0.0-6-next.27
### Patch Changes
- 65f88b82: bump logger packages
- Updated dependencies [65f88b82]
- @verdaccio/logger-prettify@6.0.0-6-next.9
- @verdaccio/core@6.0.0-6-next.59
## 6.0.0-6-next.26
### Patch Changes
- @verdaccio/core@6.0.0-6-next.58

View File

@@ -0,0 +1,10 @@
const config = require('../../../jest/config');
module.exports = Object.assign({}, config, {
coverageThreshold: {
global: {
// FIXME: increase to 90
lines: 39,
},
},
});

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/logger",
"version": "6.0.0-6-next.25",
"name": "@verdaccio/logger-commons",
"version": "6.0.0-6-next.28",
"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.57",
"@verdaccio/logger-prettify": "workspace:6.0.0-6-next.8",
"@verdaccio/core": "workspace:6.0.0-6-next.60",
"@verdaccio/logger-prettify": "workspace:6.0.0-6-next.9",
"debug": "4.3.4",
"colorette": "2.0.19",
"pino": "8.8.0"
"colorette": "2.0.19"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.19"
"pino": "8.8.0",
"@verdaccio/types": "workspace:11.0.0-6-next.20"
},
"funding": {
"type": "opencollective",

View File

@@ -0,0 +1 @@
export { setup, createLogger, prepareSetup } from './logger';

View File

@@ -1,7 +1,6 @@
// <reference types="node" />
import { isColorSupported } from 'colorette';
import buildDebug from 'debug';
import pino from 'pino';
import { fillInMsgTemplate } from '@verdaccio/logger-prettify';
import { Logger, LoggerConfigItem, LoggerFormat } from '@verdaccio/types';
@@ -33,7 +32,8 @@ export function createLogger(
// eslint-disable-next-line no-undef
// @ts-ignore
destination: NodeJS.WritableStream = pino.destination(1),
format: LoggerFormat = DEFAULT_LOG_FORMAT
format: LoggerFormat = DEFAULT_LOG_FORMAT,
pino
): any {
debug('setup logger');
let pinoConfig = {
@@ -109,7 +109,7 @@ const DEFAULT_LOGGER_CONF: LoggerConfigItem = {
export type LoggerConfig = LoggerConfigItem;
export function prepareSetup(options: LoggerConfigItem = DEFAULT_LOGGER_CONF) {
export function prepareSetup(options: LoggerConfigItem = DEFAULT_LOGGER_CONF, pino) {
let logger: Logger;
let loggerConfig = options;
if (!loggerConfig?.level) {
@@ -133,7 +133,8 @@ export function prepareSetup(options: LoggerConfigItem = DEFAULT_LOGGER_CONF) {
{ level: loggerConfig.level, path: loggerConfig.path, colors: loggerConfig.colors },
// @ts-ignore
destination,
loggerConfig.format
loggerConfig.format,
pino
);
return logger;
} else {
@@ -143,7 +144,8 @@ export function prepareSetup(options: LoggerConfigItem = DEFAULT_LOGGER_CONF) {
{ level: loggerConfig.level, colors: loggerConfig.colors },
// @ts-ignore
pino.destination(1),
loggerConfig.format
loggerConfig.format,
pino
);
return logger;
}
@@ -151,11 +153,11 @@ export function prepareSetup(options: LoggerConfigItem = DEFAULT_LOGGER_CONF) {
export let logger: Logger;
export function setup(options: LoggerConfigItem) {
export function setup(options: LoggerConfigItem, pino) {
if (typeof logger !== 'undefined') {
return logger;
}
logger = prepareSetup(options);
logger = prepareSetup(options, pino);
return logger;
}

View File

@@ -1,3 +1,4 @@
import pino from 'pino';
import { Writable } from 'stream';
import { createLogger } from '../src';
@@ -13,7 +14,7 @@ describe('logger test', () => {
callback();
},
});
const logger = createLogger({ level: 'http' }, stream, 'json');
const logger = createLogger({ level: 'http' }, stream, 'json', pino);
logger.info('test');
});
});

View File

@@ -1,5 +1,6 @@
import { readFile } from 'fs/promises';
import { join } from 'path';
import pino from 'pino';
import { setTimeout } from 'timers/promises';
import { fileUtils } from '@verdaccio/core';
@@ -27,7 +28,7 @@ describe('logger test', () => {
describe('basic', () => {
test('should include default level', async () => {
const file = await createLogFile();
const logger = prepareSetup({ type: 'file', path: file, colors: false });
const logger = prepareSetup({ type: 'file', path: file, colors: false }, pino);
logger.info({ packageName: 'test' }, `testing @{packageName}`);
// Note: this should not be logged
logger.debug(`this should not be logged`);
@@ -40,7 +41,10 @@ describe('logger test', () => {
test('should include all logging level', async () => {
const file = await createLogFile();
const logger = prepareSetup({ type: 'file', level: 'trace', path: file, colors: false });
const logger = prepareSetup(
{ type: 'file', level: 'trace', path: file, colors: false },
pino
);
logger.info({ packageName: 'test' }, `testing @{packageName}`);
logger.debug(`this should not be logged`);
logger.trace(`this should not be logged`);
@@ -55,13 +59,16 @@ describe('logger test', () => {
describe('json format', () => {
test('should log into a file with json format', async () => {
const file = await createLogFile();
const logger = prepareSetup({
...defaultOptions,
format: 'json',
type: 'file',
path: file,
level: 'info',
});
const logger = prepareSetup(
{
...defaultOptions,
format: 'json',
type: 'file',
path: file,
level: 'info',
},
pino
);
logger.info(
{ packageName: 'test' },
`publishing or updating a new version for @{packageName}`
@@ -79,13 +86,16 @@ describe('logger test', () => {
describe('pretty format', () => {
test('should log into a file with pretty', async () => {
const file = await createLogFile();
const logger = prepareSetup({
format: 'pretty',
type: 'file',
path: file,
level: 'trace',
colors: false,
});
const logger = prepareSetup(
{
format: 'pretty',
type: 'file',
path: file,
level: 'trace',
colors: false,
},
pino
);
logger.info(
{ packageName: 'test' },
`publishing or updating a new version for @{packageName}`
@@ -96,13 +106,16 @@ describe('logger test', () => {
test('should log into a file with pretty-timestamped', async () => {
const file = await createLogFile();
const logger = prepareSetup({
format: 'pretty-timestamped',
type: 'file',
path: file,
level: 'trace',
colors: false,
});
const logger = prepareSetup(
{
format: 'pretty-timestamped',
type: 'file',
path: file,
level: 'trace',
colors: false,
},
pino
);
logger.info(
{ packageName: 'test' },
`publishing or updating a new version for @{packageName}`

View File

@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./build"

View File

@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.reference.json",
"extends": "../../../tsconfig.reference.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./build"

View File

@@ -0,0 +1,14 @@
{
"extends": "../../../.babelrc",
"presets": [
[
"@babel/env",
{
"targets": {
"node": 12
}
}
],
"@babel/typescript"
]
}

View File

@@ -1,5 +1,11 @@
# @verdaccio/logger-prettify
## 6.0.0-6-next.9
### Patch Changes
- 65f88b82: bump logger packages
## 6.0.0-6-next.8
### Minor Changes

View File

@@ -1,4 +1,4 @@
const config = require('../../jest/config');
const config = require('../../../jest/config');
module.exports = Object.assign({}, config, {
coverageThreshold: {

View File

@@ -1,6 +1,6 @@
{
"name": "@verdaccio/logger-prettify",
"version": "6.0.0-6-next.8",
"version": "6.0.0-6-next.9",
"description": "logger",
"main": "./build/index.js",
"types": "build/index.d.ts",

View File

@@ -0,0 +1,9 @@
{
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./build"
},
"include": ["src/**/*.ts"],
"exclude": ["src/**/*.test.ts"]
}

View File

@@ -0,0 +1,9 @@
{
"extends": "../../../tsconfig.reference",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./build"
},
"include": ["src/**/*.ts"],
"exclude": ["src/**/*.test.ts"]
}

View File

@@ -0,0 +1,3 @@
{
"extends": "../../../.babelrc"
}

View File

@@ -1,5 +1,25 @@
# @verdaccio/logger
## 6.0.0-6-next.28
### Patch Changes
- @verdaccio/logger-commons@6.0.0-6-next.28
## 6.0.0-6-next.27
### Patch Changes
- 65f88b82: bump logger packages
- Updated dependencies [65f88b82]
- @verdaccio/logger-commons@6.0.0-6-next.27
## 6.0.0-6-next.26
### Patch Changes
- @verdaccio/logger-commons@6.0.0-6-next.26
## 6.0.0-6-next.25
### Patch Changes

View File

@@ -0,0 +1,75 @@
# @verdaccio/logger
[![backers](https://opencollective.com/verdaccio/tiers/backer/badge.svg?label=Backer&color=brightgreen)](https://opencollective.com/verdaccio)
[![stackshare](https://img.shields.io/badge/Follow%20on-StackShare-blue.svg?logo=stackshare&style=flat)](https://stackshare.io/verdaccio)
[![MIT](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/verdaccio/verdaccio/blob/master/LICENSE)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/verdaccio/localized.svg)](https://crowdin.com/project/verdaccio)
[![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/verdaccio/verdaccio)](https://www.tickgit.com/browse?repo=github.com/verdaccio/verdaccio)
[![Twitter followers](https://img.shields.io/twitter/follow/verdaccio_npm.svg?style=social&label=Follow)](https://twitter.com/verdaccio_npm)
[![Github](https://img.shields.io/github/stars/verdaccio/verdaccio.svg?style=social&label=Stars)](https://github.com/verdaccio/verdaccio/stargazers)
## Donations
Verdaccio is run by **volunteers**; nobody is working full-time on it. If you find this project to be useful and would like to support its development, consider making a donation - **your logo might end up in this readme.** 😉
**[Donate](https://opencollective.com/verdaccio)** 💵👍🏻 starting from _\$1/month_ or just one single contribution.
## Report a vulnerability
If you want to report a security vulnerability, please follow the steps which we have defined for you in our [security policy](https://github.com/verdaccio/verdaccio/security/policy).
## Open Collective Sponsors
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/verdaccio#sponsor)]
[![sponsor](https://opencollective.com/verdaccio/sponsor/0/avatar.svg)](https://opencollective.com/verdaccio/sponsor/0/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/1/avatar.svg)](https://opencollective.com/verdaccio/sponsor/1/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/2/avatar.svg)](https://opencollective.com/verdaccio/sponsor/2/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/3/avatar.svg)](https://opencollective.com/verdaccio/sponsor/3/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/4/avatar.svg)](https://opencollective.com/verdaccio/sponsor/4/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/5/avatar.svg)](https://opencollective.com/verdaccio/sponsor/5/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/6/avatar.svg)](https://opencollective.com/verdaccio/sponsor/6/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/7/avatar.svg)](https://opencollective.com/verdaccio/sponsor/7/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/8/avatar.svg)](https://opencollective.com/verdaccio/sponsor/8/website)
[![sponsor](https://opencollective.com/verdaccio/sponsor/9/avatar.svg)](https://opencollective.com/verdaccio/sponsor/9/website)
## Open Collective Backers
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/verdaccio#backer)]
[![backers](https://opencollective.com/verdaccio/backers.svg?width=890)](https://opencollective.com/verdaccio#backers)
## Special Thanks
Thanks to the following companies to help us to achieve our goals providing free open source licenses.
[![jetbrain](assets/thanks/jetbrains/logo.png)](https://www.jetbrains.com/)
[![crowdin](assets/thanks/crowdin/logo.png)](https://crowdin.com/)
[![balsamiq](assets/thanks/balsamiq/logo.jpg)](https://balsamiq.com/)
## Contributors
This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
[![contributors](https://opencollective.com/verdaccio/contributors.svg?width=890&button=true)](../../graphs/contributors)
### FAQ / Contact / Troubleshoot
If you have any issue you can try the following options, do no desist to ask or check our issues database, perhaps someone has asked already what you are looking for.
- [Blog](https://verdaccio.org/blog/)
- [Donations](https://opencollective.com/verdaccio)
- [Reporting an issue](https://github.com/verdaccio/verdaccio/blob/master/CONTRIBUTING.md#reporting-a-bug)
- [Running discussions](https://github.com/verdaccio/verdaccio/issues?q=is%3Aissue+is%3Aopen+label%3Adiscuss)
- [Chat](http://chat.verdaccio.org/)
- [Logos](https://verdaccio.org/docs/en/logo)
- [Docker Examples](https://github.com/verdaccio/docker-examples)
- [FAQ](https://github.com/verdaccio/verdaccio/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3Aquestion%20)
### License
Verdaccio is [MIT licensed](https://github.com/verdaccio/verdaccio/blob/master/LICENSE)
The Verdaccio documentation and logos (excluding /thanks, e.g., .md, .png, .sketch) files within the /assets folder) is
[Creative Commons licensed](https://github.com/verdaccio/verdaccio/blob/master/LICENSE-docs).

View File

@@ -0,0 +1,10 @@
const config = require('../../../jest/config');
module.exports = Object.assign({}, config, {
coverageThreshold: {
global: {
// FIXME: increase to 90
lines: 39,
},
},
});

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