Compare commits
81 Commits
@verdaccio
...
@verdaccio
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
489631bda9 | ||
|
|
112f1d60b8 | ||
|
|
e87b29885b | ||
|
|
ccc7bd1df5 | ||
|
|
3c6e6b9af7 | ||
|
|
096d634917 | ||
|
|
87fa9270a5 | ||
|
|
dc2cd48a78 | ||
|
|
4c54c0c67d | ||
|
|
6bed536f80 | ||
|
|
1f4fa441ae | ||
|
|
c5f5e75818 | ||
|
|
b3f52486f7 | ||
|
|
bbfb4118bf | ||
|
|
6c5f7a4fa0 | ||
|
|
2274e483ac | ||
|
|
d0dacd75c5 | ||
|
|
5bcfd7e2e2 | ||
|
|
71fcd2de91 | ||
|
|
39f7fd6057 | ||
|
|
96b28575a3 | ||
|
|
6249cbf562 | ||
|
|
136e992bb9 | ||
|
|
2ee690638d | ||
|
|
c31aec8336 | ||
|
|
5a0c23f900 | ||
|
|
19df355e3c | ||
|
|
39f71f5d7d | ||
|
|
a985ddc246 | ||
|
|
2a6ee33071 | ||
|
|
919795c804 | ||
|
|
d60bf44c43 | ||
|
|
6626e77766 | ||
|
|
03a903d924 | ||
|
|
6ee0afb13a | ||
|
|
016812b12c | ||
|
|
3b3cf86b54 | ||
|
|
5a77414eb6 | ||
|
|
da6d8e5f38 | ||
|
|
c7ba6b95f6 | ||
|
|
744a806411 | ||
|
|
1deb734b3e | ||
|
|
9caca4b573 | ||
|
|
fec5a46b22 | ||
|
|
6aa850a8b4 | ||
|
|
85ef861cab | ||
|
|
3bc24bc4a7 | ||
|
|
26eeb022bb | ||
|
|
4c41982d9c | ||
|
|
88c2885cb6 | ||
|
|
e0ffae411d | ||
|
|
693b57c949 | ||
|
|
10dd81f473 | ||
|
|
2ee28c0988 | ||
|
|
533abbd6e3 | ||
|
|
33e25d2876 | ||
|
|
7d4adac1fc | ||
|
|
0f94336a9e | ||
|
|
36feb886ee | ||
|
|
e54fc76f8e | ||
|
|
8be0d4882e | ||
|
|
0905d04801 | ||
|
|
e7517acff9 | ||
|
|
15a86b7dd2 | ||
|
|
73f81ee7a9 | ||
|
|
e7ceb8c9e6 | ||
|
|
a528af49bc | ||
|
|
117eb1ca42 | ||
|
|
199aea375a | ||
|
|
de6ff5cb0d | ||
|
|
b270f7a975 | ||
|
|
6e764e3c49 | ||
|
|
ecbc569f23 | ||
|
|
34be970100 | ||
|
|
fd79e7c637 | ||
|
|
d4b9a6c374 | ||
|
|
441c226fbb | ||
|
|
b06b2e7ef1 | ||
|
|
9d1f6ee54d | ||
|
|
3433d7ec0b | ||
|
|
f604ec8a34 |
6
.babelrc
6
.babelrc
@@ -10,9 +10,5 @@
|
||||
],
|
||||
"@babel/typescript"
|
||||
],
|
||||
"ignore": ["**/*.d.ts"],
|
||||
"plugins": [
|
||||
"@babel/plugin-proposal-optional-chaining",
|
||||
"@babel/plugin-proposal-nullish-coalescing-operator"
|
||||
]
|
||||
"ignore": ["**/*.d.ts"]
|
||||
}
|
||||
|
||||
5
.changeset/chilly-rivers-chew.md
Normal file
5
.changeset/chilly-rivers-chew.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'@verdaccio/cli': patch
|
||||
---
|
||||
|
||||
chore: add config location and loglevel to startup log
|
||||
5
.changeset/cuddly-camels-relax.md
Normal file
5
.changeset/cuddly-camels-relax.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'@verdaccio/middleware': patch
|
||||
---
|
||||
|
||||
fix(middleware): custom favicon
|
||||
10
.changeset/dirty-dolphins-try.md
Normal file
10
.changeset/dirty-dolphins-try.md
Normal file
@@ -0,0 +1,10 @@
|
||||
---
|
||||
'@verdaccio/ui-components': minor
|
||||
'@verdaccio/ui-theme': patch
|
||||
'@verdaccio/types': patch
|
||||
'@verdaccio/middleware': patch
|
||||
'@verdaccio/config': patch
|
||||
'@verdaccio/cli': patch
|
||||
---
|
||||
|
||||
feat: complete overhaul of web user interface
|
||||
6
.changeset/dirty-islands-push.md
Normal file
6
.changeset/dirty-islands-push.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
'@verdaccio/ui-components': patch
|
||||
'@verdaccio/ui-theme': patch
|
||||
---
|
||||
|
||||
chore: fix type for country flags
|
||||
5
.changeset/fluffy-onions-act.md
Normal file
5
.changeset/fluffy-onions-act.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'@verdaccio/middleware': patch
|
||||
---
|
||||
|
||||
fix(middleware): link to favicon in template
|
||||
5
.changeset/good-lions-rush.md
Normal file
5
.changeset/good-lions-rush.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'@verdaccio/ui-components': patch
|
||||
---
|
||||
|
||||
chore: sync dependency defs between ui-components and ui-theme
|
||||
9
.changeset/grumpy-pots-watch.md
Normal file
9
.changeset/grumpy-pots-watch.md
Normal file
@@ -0,0 +1,9 @@
|
||||
---
|
||||
'@verdaccio/types': patch
|
||||
'@verdaccio/config': patch
|
||||
'@verdaccio/core': patch
|
||||
'@verdaccio/store': patch
|
||||
'@verdaccio/api': patch
|
||||
---
|
||||
|
||||
feat: add support for npm owner
|
||||
5
.changeset/many-bees-tickle.md
Normal file
5
.changeset/many-bees-tickle.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'verdaccio-audit': minor
|
||||
---
|
||||
|
||||
feat: verdaccio-audit support timeout option
|
||||
6
.changeset/mighty-gorillas-fail.md
Normal file
6
.changeset/mighty-gorillas-fail.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
'@verdaccio/middleware': patch
|
||||
'@verdaccio/url': patch
|
||||
---
|
||||
|
||||
fix(middleware): link to favicon in template
|
||||
5
.changeset/nervous-fireants-design.md
Normal file
5
.changeset/nervous-fireants-design.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'generator-verdaccio-plugin': major
|
||||
---
|
||||
|
||||
feat: migration to monorepo
|
||||
@@ -57,21 +57,32 @@
|
||||
"@verdaccio/website": "5.20.2",
|
||||
"@verdaccio/local-publish": "0.0.1",
|
||||
"@verdaccio/search": "7.0.0-next.0",
|
||||
"@verdaccio/e2e-cli-pnpm9": "1.0.1"
|
||||
"@verdaccio/e2e-cli-pnpm9": "1.0.1",
|
||||
"generator-verdaccio-plugin": "4.1.0"
|
||||
},
|
||||
"changesets": [
|
||||
"angry-trees-tie",
|
||||
"big-cameras-invent",
|
||||
"breezy-mayflies-pull",
|
||||
"chilled-carrots-guess",
|
||||
"chilly-rivers-chew",
|
||||
"cuddly-camels-relax",
|
||||
"dirty-dolphins-try",
|
||||
"dirty-islands-push",
|
||||
"dry-shoes-report",
|
||||
"eight-icons-heal",
|
||||
"eight-squids-judge",
|
||||
"eighty-lobsters-study",
|
||||
"fluffy-onions-act",
|
||||
"good-cups-train",
|
||||
"good-lions-rush",
|
||||
"grumpy-pots-watch",
|
||||
"itchy-mangos-wink",
|
||||
"long-jars-collect",
|
||||
"long-moles-attend",
|
||||
"many-bees-tickle",
|
||||
"mighty-gorillas-fail",
|
||||
"nervous-fireants-design",
|
||||
"old-turkeys-heal",
|
||||
"olive-bananas-wink",
|
||||
"perfect-chairs-act",
|
||||
@@ -80,6 +91,7 @@
|
||||
"poor-seals-turn",
|
||||
"quick-buses-scream",
|
||||
"real-socks-vanish",
|
||||
"rich-shrimps-check",
|
||||
"sharp-wolves-carry",
|
||||
"shiny-worms-retire",
|
||||
"shy-carrots-compare",
|
||||
@@ -89,13 +101,17 @@
|
||||
"spicy-birds-flow",
|
||||
"strange-points-repair",
|
||||
"stupid-dancers-relate",
|
||||
"ten-kids-tan",
|
||||
"thin-snails-flow",
|
||||
"thirty-toes-swim",
|
||||
"twenty-queens-protect",
|
||||
"unlucky-cycles-sparkle",
|
||||
"weak-fans-explain",
|
||||
"wet-balloons-give",
|
||||
"wicked-kiwis-check",
|
||||
"wicked-worms-wash",
|
||||
"wild-otters-talk",
|
||||
"witty-meals-nail",
|
||||
"young-donuts-own"
|
||||
]
|
||||
}
|
||||
|
||||
6
.changeset/rich-shrimps-check.md
Normal file
6
.changeset/rich-shrimps-check.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
'@verdaccio/types': patch
|
||||
'@verdaccio/store': patch
|
||||
---
|
||||
|
||||
fix: update fields for abbreviated manifest
|
||||
5
.changeset/ten-kids-tan.md
Normal file
5
.changeset/ten-kids-tan.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'@verdaccio/ui-components': patch
|
||||
---
|
||||
|
||||
chore(ui): update babel dependencies
|
||||
6
.changeset/thin-snails-flow.md
Normal file
6
.changeset/thin-snails-flow.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
'@verdaccio/config': patch
|
||||
'@verdaccio/website': patch
|
||||
---
|
||||
|
||||
fix: typo in config docs regarding check_owners
|
||||
7
.changeset/twenty-queens-protect.md
Normal file
7
.changeset/twenty-queens-protect.md
Normal file
@@ -0,0 +1,7 @@
|
||||
---
|
||||
'@verdaccio/ui-theme': patch
|
||||
'@verdaccio/ui-components': patch
|
||||
'@verdaccio/types': patch
|
||||
---
|
||||
|
||||
fix: change bundleDependencies to array
|
||||
5
.changeset/witty-meals-nail.md
Normal file
5
.changeset/witty-meals-nail.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'@verdaccio/api': patch
|
||||
---
|
||||
|
||||
chore(api): update comment about route parameters
|
||||
@@ -18,19 +18,21 @@ jobs:
|
||||
env:
|
||||
NODE_ENV: production
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
node-version-file: '.nvmrc'
|
||||
- name: Install pnpm
|
||||
run: npm i pnpm@latest-8 -g
|
||||
run: |
|
||||
corepack enable
|
||||
corepack install
|
||||
- name: set store
|
||||
run: |
|
||||
mkdir ~/.pnpm-store
|
||||
pnpm config set store-dir ~/.pnpm-store
|
||||
- name: Install
|
||||
run: pnpm install --registry http://localhost:4873
|
||||
run: pnpm install --registry http://localhost:4873
|
||||
- name: Cache .pnpm-store
|
||||
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v3
|
||||
with:
|
||||
@@ -43,7 +45,7 @@ jobs:
|
||||
name: Lint
|
||||
needs: prepare
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -67,7 +69,7 @@ jobs:
|
||||
name: Format
|
||||
needs: prepare
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Use Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -96,7 +98,7 @@ jobs:
|
||||
name: ${{ matrix.os }} / Node ${{ matrix.node_version }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Use Node ${{ matrix.node_version }}
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -122,7 +124,7 @@ jobs:
|
||||
runs-on: windows-latest
|
||||
name: UI Test E2E
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
node-version-file: '.nvmrc'
|
||||
2
.github/workflows/changesets.yml
vendored
2
.github/workflows/changesets.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
||||
if: github.ref == 'refs/heads/master' && github.repository == 'verdaccio/verdaccio'
|
||||
steps:
|
||||
- name: checkout code repository
|
||||
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
||||
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
@@ -30,7 +30,7 @@ jobs:
|
||||
env:
|
||||
NODE_ENV: production
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -57,7 +57,7 @@ jobs:
|
||||
name: Lint
|
||||
needs: prepare
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -82,7 +82,7 @@ jobs:
|
||||
name: Format
|
||||
needs: prepare
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Use Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -112,7 +112,7 @@ jobs:
|
||||
name: ${{ matrix.os }} / Node ${{ matrix.node_version }}
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Use Node ${{ matrix.node_version }}
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -140,7 +140,7 @@ jobs:
|
||||
name: synchronize translations
|
||||
if: (github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'verdaccio/verdaccio') || github.event_name == 'workflow_dispatch'
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
node-version-file: '.nvmrc'
|
||||
|
||||
8
.github/workflows/codeql-analysis.yml
vendored
8
.github/workflows/codeql-analysis.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
with:
|
||||
# We must fetch at least the immediate parents so that if this is
|
||||
# a pull request then we can checkout the head.
|
||||
@@ -34,7 +34,7 @@ jobs:
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v2
|
||||
uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 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@f079b8493333aace61c81488f8bd40919487bd9f # v2
|
||||
uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 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@f079b8493333aace61c81488f8bd40919487bd9f # v2
|
||||
uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v2
|
||||
|
||||
@@ -16,7 +16,7 @@ jobs:
|
||||
NODE_OPTIONS: --max_old_space_size=4096
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
|
||||
- name: Start containers
|
||||
run: docker-compose -f "./e2e/docker/apache-verdaccio/docker-compose.yaml" up -d --build
|
||||
|
||||
2
.github/workflows/docker-proxy-nginx-e2e.yml
vendored
2
.github/workflows/docker-proxy-nginx-e2e.yml
vendored
@@ -13,7 +13,7 @@ jobs:
|
||||
NODE_OPTIONS: --max_old_space_size=4096
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
|
||||
- name: Start containers
|
||||
run: docker-compose -f "./e2e/docker/proxy-nginx/docker-compose.yaml" up -d --build
|
||||
|
||||
4
.github/workflows/docker-publish.yml
vendored
4
.github/workflows/docker-publish.yml
vendored
@@ -24,7 +24,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository == 'verdaccio/verdaccio'
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # tag=v1
|
||||
- uses: docker/setup-buildx-action@v1
|
||||
with:
|
||||
@@ -46,7 +46,7 @@ jobs:
|
||||
{{major}}
|
||||
{{major}}.{{minor}}
|
||||
- name: Build & Push
|
||||
uses: docker/build-push-action@v4
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile
|
||||
|
||||
10
.github/workflows/e2e-ci.yml
vendored
10
.github/workflows/e2e-ci.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
env:
|
||||
NODE_ENV: production
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Use Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
needs: [prepare]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Use Node 16
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -97,7 +97,7 @@ jobs:
|
||||
name: ${{ matrix.pkg }}/ ubuntu-latest / ${{ matrix.node }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
node-version: ${{ matrix.node }}
|
||||
@@ -141,7 +141,7 @@ jobs:
|
||||
name: ${{ matrix.pkg }}/ ubuntu-latest / ${{ matrix.node }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
node-version: ${{ matrix.node }}
|
||||
@@ -186,7 +186,7 @@ jobs:
|
||||
name: ${{ matrix.pkg }}/ ubuntu-latest / ${{ matrix.node }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
node-version: ${{ matrix.node }}
|
||||
|
||||
4
.github/workflows/e2e-ui.yml
vendored
4
.github/workflows/e2e-ui.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
env:
|
||||
NODE_ENV: production
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Use Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
@@ -33,7 +33,7 @@ jobs:
|
||||
run: pnpm build
|
||||
- name: Test UI
|
||||
run: pnpm test:e2e:ui
|
||||
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v3
|
||||
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
|
||||
with:
|
||||
name: videos
|
||||
path: /home/runner/work/verdaccio/verdaccio/e2e/ui/cypress/videos
|
||||
|
||||
47
.github/workflows/plugin-generator-e2e.yaml
vendored
Normal file
47
.github/workflows/plugin-generator-e2e.yaml
vendored
Normal file
@@ -0,0 +1,47 @@
|
||||
name: E2E Generator Verdaccio Plugin
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
jobs:
|
||||
e2e-plugin-generator:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [18,20, 21]
|
||||
steps:
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
- name: Install pnpm
|
||||
run: |
|
||||
corepack enable
|
||||
corepack install
|
||||
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v3
|
||||
with:
|
||||
path: ~/.pnpm-store
|
||||
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
|
||||
- name: install
|
||||
run: pnpm install
|
||||
- name: build
|
||||
run: pnpm build
|
||||
- name: install verdaccio
|
||||
run: npm install -g verdaccio@5
|
||||
- name: Start server
|
||||
run: verdaccio -c e2e/docker/generator-e2e/generator.yaml &
|
||||
- name: ping server
|
||||
run: curl http://localhost:4873/-/ping
|
||||
- name: login
|
||||
run: npx npm-cli-login -u test -p test -e test@domain.test -r http://localhost:4873
|
||||
- name: publish
|
||||
run: pnpm local:publish
|
||||
- name: install yeoman
|
||||
run: npm install -g yo@4 --loglevel=info
|
||||
- name: install generator
|
||||
run: npm install -g generator-verdaccio-plugin --loglevel=info --registry http://localhost:4873
|
||||
# Future: add a test to verify the plugin is working with prompt
|
||||
2
.github/workflows/static-data.yml
vendored
2
.github/workflows/static-data.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository == 'verdaccio/verdaccio'
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
with:
|
||||
persist-credentials: false
|
||||
fetch-depth: 0
|
||||
|
||||
2
.github/workflows/ui-components.yml
vendored
2
.github/workflows/ui-components.yml
vendored
@@ -23,7 +23,7 @@ jobs:
|
||||
env:
|
||||
NODE_OPTIONS: --max_old_space_size=4096
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
|
||||
- name: Use Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
|
||||
2
.github/workflows/website.yml
vendored
2
.github/workflows/website.yml
vendored
@@ -26,7 +26,7 @@ jobs:
|
||||
env:
|
||||
NODE_OPTIONS: --max_old_space_size=4096
|
||||
steps:
|
||||
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3
|
||||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3
|
||||
|
||||
- name: Node
|
||||
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
|
||||
|
||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -41,7 +41,7 @@ packages/plugins/ui-theme/static
|
||||
# CI Pnpm cache
|
||||
.pnpm-store/
|
||||
|
||||
#docs
|
||||
#docs
|
||||
website/docs/api/**/*.md
|
||||
website/docs/api/**/*.yml
|
||||
!website/docs/api/index.md
|
||||
@@ -53,3 +53,6 @@ e2e/ui/cypress/screenshots/**/*
|
||||
|
||||
# storybook
|
||||
packages/ui-components/storybook-static
|
||||
|
||||
# plugin generator
|
||||
packages/tools/generator-verdaccio-plugin/generators/
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM --platform=${BUILDPLATFORM:-linux/amd64} node:21-alpine as builder
|
||||
FROM --platform=${BUILDPLATFORM:-linux/amd64} node:21-alpine AS builder
|
||||
|
||||
ENV NODE_ENV=development \
|
||||
VERDACCIO_BUILD_REGISTRY=https://registry.npmjs.org
|
||||
|
||||
@@ -251,7 +251,7 @@ Verdaccio aims to support all features of a standard npm client that make sense
|
||||
|
||||
- Registering new users (`npm adduser {newuser}`) - **supported**
|
||||
- Change password (`npm profile set password`) - **supported**
|
||||
- Transferring ownership (`npm owner add {user} {pkg}`) - not supported, _PR-welcome_
|
||||
- Transferring ownership (`npm owner`) - **supported**
|
||||
- Token (`npm token`) - **supported**
|
||||
|
||||
### Miscellaneous
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Docs based on https://github.com/xlts-dev/verdaccio-prometheus-middleware#installation
|
||||
# Docker multi-stage build - https://docs.docker.com/develop/develop-images/multistage-build/
|
||||
# Use an alpine node image to install the plugin
|
||||
FROM node:lts-alpine as builder
|
||||
FROM node:lts-alpine AS builder
|
||||
|
||||
RUN mkdir -p /verdaccio/plugins
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# Docker multi-stage build - https://docs.docker.com/develop/develop-images/multistage-build/
|
||||
# Use an alpine node image to install the plugin
|
||||
FROM node:lts-alpine as builder
|
||||
FROM node:lts-alpine AS builder
|
||||
|
||||
# Install the metrics middleware plugin
|
||||
# npm docs
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Docs based on https://github.com/xlts-dev/verdaccio-prometheus-middleware#installation
|
||||
# Docker multi-stage build - https://docs.docker.com/develop/develop-images/multistage-build/
|
||||
# Use an alpine node image to install the plugin
|
||||
FROM node:lts-alpine as builder
|
||||
FROM node:lts-alpine AS builder
|
||||
|
||||
RUN mkdir -p /verdaccio/plugins
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
"main": "./build/index.js",
|
||||
"types": "./build/index.d.ts",
|
||||
"devDependencies": {
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5",
|
||||
"debug": "4.3.4",
|
||||
"fs-extra": "11.2.0",
|
||||
"get-port": "5.1.1",
|
||||
"got": "11.8.6",
|
||||
"js-yaml": "4.1.0",
|
||||
"lodash": "4.17.21",
|
||||
"verdaccio": "workspace:7.0.0-next-7.16"
|
||||
"verdaccio": "workspace:7.0.0-next-7.20"
|
||||
},
|
||||
"scripts": {
|
||||
"test": "jest",
|
||||
|
||||
43
e2e/docker/generator-e2e/generator.yaml
Normal file
43
e2e/docker/generator-e2e/generator.yaml
Normal file
@@ -0,0 +1,43 @@
|
||||
storage: ./storage
|
||||
|
||||
web:
|
||||
title: Verdaccio E2E Local
|
||||
auth:
|
||||
htpasswd:
|
||||
file: ./htpasswd
|
||||
uplinks:
|
||||
npmjs:
|
||||
url: https://registry.npmjs.org/
|
||||
packages:
|
||||
'@verdaccio/*':
|
||||
access: $all
|
||||
publish: $all
|
||||
unpublish: $all
|
||||
'@*/*':
|
||||
access: $all
|
||||
publish: $authenticated
|
||||
unpublish: $authenticated
|
||||
proxy: npmjs
|
||||
'verdaccio-*':
|
||||
access: $all
|
||||
publish: $all
|
||||
unpublish: $all
|
||||
'generator-verdaccio-plugin':
|
||||
access: $all
|
||||
publish: $all
|
||||
unpublish: $all
|
||||
'verdaccio':
|
||||
access: $all
|
||||
publish: $all
|
||||
unpublish: $all
|
||||
'**':
|
||||
access: $all
|
||||
publish: $authenticated
|
||||
unpublish: $authenticated
|
||||
proxy: npmjs
|
||||
|
||||
middlewares:
|
||||
audit:
|
||||
enabled: false
|
||||
|
||||
log: { type: stdout, format: json, level: http }
|
||||
@@ -3,9 +3,9 @@
|
||||
"name": "@verdaccio/e2e-ui",
|
||||
"version": "2.0.0",
|
||||
"devDependencies": {
|
||||
"verdaccio": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.16",
|
||||
"verdaccio": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/test-helper": "workspace:3.0.0-next-7.2",
|
||||
"debug": "4.3.4",
|
||||
"cypress": "^13.6.0",
|
||||
|
||||
99
package.json
99
package.json
@@ -15,80 +15,81 @@
|
||||
"url": "https://opencollective.com/verdaccio"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/cli": "7.23.9",
|
||||
"@babel/core": "7.23.9",
|
||||
"@babel/eslint-parser": "7.23.3",
|
||||
"@babel/node": "7.23.9",
|
||||
"@babel/plugin-proposal-class-properties": "7.18.6",
|
||||
"@babel/plugin-proposal-decorators": "7.23.9",
|
||||
"@babel/plugin-proposal-export-namespace-from": "7.18.9",
|
||||
"@babel/plugin-proposal-function-sent": "7.23.3",
|
||||
"@babel/plugin-proposal-json-strings": "7.18.6",
|
||||
"@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
|
||||
"@babel/plugin-proposal-numeric-separator": "7.18.6",
|
||||
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
|
||||
"@babel/plugin-proposal-optional-chaining": "7.21.0",
|
||||
"@babel/plugin-proposal-throw-expressions": "7.23.3",
|
||||
"@babel/cli": "7.24.8",
|
||||
"@babel/core": "7.24.9",
|
||||
"@babel/eslint-parser": "7.25.0",
|
||||
"@babel/node": "7.25.0",
|
||||
"@babel/plugin-proposal-decorators": "7.24.7",
|
||||
"@babel/plugin-proposal-function-sent": "7.24.7",
|
||||
"@babel/plugin-proposal-throw-expressions": "7.24.7",
|
||||
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
||||
"@babel/plugin-syntax-import-meta": "7.10.4",
|
||||
"@babel/plugin-transform-async-to-generator": "7.23.3",
|
||||
"@babel/plugin-transform-classes": "7.23.8",
|
||||
"@babel/plugin-transform-runtime": "7.23.9",
|
||||
"@babel/preset-env": "7.23.9",
|
||||
"@babel/preset-react": "7.23.3",
|
||||
"@babel/preset-typescript": "7.23.3",
|
||||
"@babel/register": "7.23.7",
|
||||
"@babel/runtime": "7.23.9",
|
||||
"@babel/plugin-transform-async-to-generator": "7.24.7",
|
||||
"@babel/plugin-transform-class-properties": "7.24.7",
|
||||
"@babel/plugin-transform-classes": "7.25.0",
|
||||
"@babel/plugin-transform-export-namespace-from": "7.24.7",
|
||||
"@babel/plugin-transform-json-strings": "7.24.7",
|
||||
"@babel/plugin-transform-nullish-coalescing-operator": "7.24.7",
|
||||
"@babel/plugin-transform-numeric-separator": "7.24.7",
|
||||
"@babel/plugin-transform-object-rest-spread": "7.24.7",
|
||||
"@babel/plugin-transform-optional-chaining": "7.24.8",
|
||||
"@babel/plugin-transform-runtime": "7.24.7",
|
||||
"@babel/preset-env": "7.25.0",
|
||||
"@babel/preset-react": "7.24.7",
|
||||
"@babel/preset-typescript": "7.24.7",
|
||||
"@babel/register": "7.24.6",
|
||||
"@babel/runtime": "7.25.0",
|
||||
"@changesets/changelog-github": "0.5.0",
|
||||
"@changesets/cli": "2.27.1",
|
||||
"@changesets/get-dependents-graph": "1.3.6",
|
||||
"@crowdin/cli": "3.16.1",
|
||||
"@changesets/cli": "2.27.7",
|
||||
"@changesets/get-dependents-graph": "2.1.1",
|
||||
"@crowdin/cli": "4.1.1",
|
||||
"@dianmora/contributors": "5.0.0",
|
||||
"@emotion/react": "11.10.6",
|
||||
"@emotion/styled": "11.10.6",
|
||||
"@testing-library/dom": "9.3.4",
|
||||
"@testing-library/jest-dom": "6.4.2",
|
||||
"@testing-library/dom": "10.4.0",
|
||||
"@testing-library/jest-dom": "6.4.8",
|
||||
"@testing-library/react": "16.0.0",
|
||||
"@testing-library/user-event": "14.5.2",
|
||||
"aria-query": "5.1.3",
|
||||
"@testing-library/react": "14.2.1",
|
||||
"@trivago/prettier-plugin-sort-imports": "4.3.0",
|
||||
"@types/body-parser": "1.19.5",
|
||||
"@types/connect": "3.4.38",
|
||||
"@types/cookiejar": "2.1.5",
|
||||
"@types/debug": "4.1.12",
|
||||
"@types/express": "4.17.21",
|
||||
"@types/express-serve-static-core": "4.17.42",
|
||||
"@types/express-serve-static-core": "4.19.5",
|
||||
"@types/http-errors": "2.0.4",
|
||||
"@types/jest": "29.5.11",
|
||||
"@types/jsonwebtoken": "9.0.5",
|
||||
"@types/lodash": "4.14.202",
|
||||
"@types/jest": "29.5.12",
|
||||
"@types/jsonwebtoken": "9.0.6",
|
||||
"@types/lodash": "4.17.7",
|
||||
"@types/mime": "3.0.4",
|
||||
"@types/minimatch": "5.1.2",
|
||||
"@types/node": "20.11.7",
|
||||
"@types/node": "20.14.12",
|
||||
"@types/node-fetch": "2.6.11",
|
||||
"@types/qs": "6.9.11",
|
||||
"@types/qs": "6.9.15",
|
||||
"@types/range-parser": "1.2.7",
|
||||
"@types/react": "18.2.48",
|
||||
"@types/react-dom": "18.2.18",
|
||||
"@types/react": "18.3.3",
|
||||
"@types/react-dom": "18.3.0",
|
||||
"@types/react-router-dom": "5.3.3",
|
||||
"@types/react-virtualized": "9.21.29",
|
||||
"@types/redux": "3.6.0",
|
||||
"@types/semver": "7.5.6",
|
||||
"@types/react-virtualized": "9.21.30",
|
||||
"@types/semver": "7.5.8",
|
||||
"@types/send": "0.17.4",
|
||||
"@types/serve-static": "1.15.5",
|
||||
"@types/serve-static": "1.15.7",
|
||||
"@types/superagent": "4.1.24",
|
||||
"@types/supertest": "2.0.16",
|
||||
"@types/testing-library__jest-dom": "6.0.0",
|
||||
"@types/validator": "13.11.8",
|
||||
"@types/validator": "13.12.0",
|
||||
"@types/webpack": "5.28.5",
|
||||
"@types/webpack-env": "1.18.4",
|
||||
"@typescript-eslint/eslint-plugin": "6.19.1",
|
||||
"@typescript-eslint/parser": "6.19.1",
|
||||
"@types/webpack-env": "1.18.5",
|
||||
"@types/yeoman-environment": "2.10.11",
|
||||
"@types/yeoman-generator": "5.2.14",
|
||||
"@types/yeoman-test": "4.0.6",
|
||||
"@typescript-eslint/eslint-plugin": "6.21.0",
|
||||
"@typescript-eslint/parser": "6.21.0",
|
||||
"@verdaccio/crowdin-translations": "workspace:*",
|
||||
"@verdaccio/eslint-config": "workspace:*",
|
||||
"@verdaccio/types": "workspace:*",
|
||||
"@verdaccio/ui-theme": "workspace:*",
|
||||
"@vitest/coverage-v8": "0.34.6",
|
||||
"aria-query": "5.1.3",
|
||||
"babel-core": "7.0.0-bridge.0",
|
||||
"babel-jest": "29.7.0",
|
||||
"babel-plugin-dynamic-import-node": "2.3.3",
|
||||
@@ -118,16 +119,16 @@
|
||||
"react-dom": "18.2.0",
|
||||
"rimraf": "5.0.5",
|
||||
"selfsigned": "2.4.1",
|
||||
"supertest": "6.3.4",
|
||||
"supertest": "7.0.0",
|
||||
"ts-node": "10.9.2",
|
||||
"typescript": "5.3.3",
|
||||
"undici-types": "5.28.2",
|
||||
"update-ts-references": "3.2.1",
|
||||
"update-ts-references": "3.3.0",
|
||||
"verdaccio-audit": "workspace:*",
|
||||
"verdaccio-auth-memory": "workspace:*",
|
||||
"verdaccio-htpasswd": "workspace:*",
|
||||
"verdaccio-memory": "workspace:*",
|
||||
"vitest": "0.34.6"
|
||||
"vitest": "1.6.0"
|
||||
},
|
||||
"scripts": {
|
||||
"prepare": "husky install",
|
||||
|
||||
@@ -1,5 +1,62 @@
|
||||
# @verdaccio/api
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [ccc7bd1]
|
||||
- @verdaccio/middleware@7.0.0-next-7.20
|
||||
- @verdaccio/auth@7.0.0-next-7.20
|
||||
- @verdaccio/store@7.0.0-next-7.20
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
- @verdaccio/config@7.0.0-next-7.20
|
||||
- @verdaccio/utils@7.0.0-next-7.20
|
||||
- @verdaccio/logger@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 19df355: chore(api): update comment about route parameters
|
||||
- Updated dependencies [2a6ee33]
|
||||
- Updated dependencies [6c5f7a4]
|
||||
- Updated dependencies [c31aec8]
|
||||
- @verdaccio/middleware@7.0.0-next-7.19
|
||||
- @verdaccio/config@7.0.0-next-7.19
|
||||
- @verdaccio/auth@7.0.0-next-7.19
|
||||
- @verdaccio/store@7.0.0-next-7.19
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
- @verdaccio/utils@7.0.0-next-7.19
|
||||
- @verdaccio/logger@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [10dd81f]
|
||||
- @verdaccio/middleware@7.0.0-next-7.18
|
||||
- @verdaccio/config@7.0.0-next-7.18
|
||||
- @verdaccio/auth@7.0.0-next-7.18
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
- @verdaccio/logger@7.0.0-next-7.18
|
||||
- @verdaccio/store@7.0.0-next-7.18
|
||||
- @verdaccio/utils@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 6e764e3: feat: add support for npm owner
|
||||
- Updated dependencies [6e764e3]
|
||||
- Updated dependencies [de6ff5c]
|
||||
- @verdaccio/config@7.0.0-next-7.17
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
- @verdaccio/store@7.0.0-next-7.17
|
||||
- @verdaccio/auth@7.0.0-next-7.17
|
||||
- @verdaccio/logger@7.0.0-next-7.17
|
||||
- @verdaccio/middleware@7.0.0-next-7.17
|
||||
- @verdaccio/utils@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/api",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"description": "loaders logic",
|
||||
"main": "./build/index.js",
|
||||
"types": "build/index.d.ts",
|
||||
@@ -38,13 +38,13 @@
|
||||
},
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@verdaccio/auth": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/middleware": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/store": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/auth": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/middleware": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/store": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.20",
|
||||
"abortcontroller-polyfill": "1.7.5",
|
||||
"body-parser": "1.20.2",
|
||||
"cookies": "0.9.0",
|
||||
@@ -52,14 +52,14 @@
|
||||
"express": "4.19.2",
|
||||
"lodash": "4.17.21",
|
||||
"mime": "2.6.0",
|
||||
"semver": "7.6.0"
|
||||
"semver": "7.6.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/test-helper": "workspace:3.0.0-next-7.2",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5",
|
||||
"mockdate": "3.0.5",
|
||||
"nock": "13.5.1",
|
||||
"supertest": "6.3.4"
|
||||
"supertest": "7.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
|
||||
@@ -37,10 +37,11 @@ export default function (config: Config, auth: Auth, storage: Storage): Router {
|
||||
app.param('revision', validateName);
|
||||
app.param('token', validateName);
|
||||
|
||||
// these can't be safely put into express url for some reason
|
||||
// TODO: For some reason? what reason?
|
||||
// Express route parameter names must be valid JavaScript identifiers, which means
|
||||
// they cannot start with a hyphen (-) or contain special characters like dots (.)
|
||||
app.param('_rev', match(/^-rev$/));
|
||||
app.param('org_couchdb_user', match(/^org\.couchdb\.user:/));
|
||||
|
||||
app.use(auth.apiJWTmiddleware());
|
||||
app.use(express.json({ strict: false, limit: config.max_body_size || '10mb' }));
|
||||
app.use(antiLoop(config));
|
||||
|
||||
@@ -28,6 +28,7 @@ export default function (route: Router, auth: Auth, storage: Storage): void {
|
||||
const name = req.params.package;
|
||||
let version = req.params.version;
|
||||
const write = req.query.write === 'true';
|
||||
const username = req?.remote_user?.name;
|
||||
const abbreviated =
|
||||
stringUtils.getByQualityPriorityValue(req.get('Accept')) === Storage.ABBREVIATED_HEADER;
|
||||
const requestOptions = {
|
||||
@@ -37,6 +38,7 @@ export default function (route: Router, auth: Auth, storage: Storage): void {
|
||||
host: req.host,
|
||||
remoteAddress: req.socket.remoteAddress,
|
||||
byPassCache: write,
|
||||
username,
|
||||
};
|
||||
|
||||
try {
|
||||
|
||||
@@ -76,11 +76,11 @@ const debug = buildDebug('verdaccio:api:publish');
|
||||
*
|
||||
* 3. Star a package
|
||||
*
|
||||
* Permissions: start a package depends of the publish and unpublish permissions, there is no
|
||||
* specific flag for star or un start.
|
||||
* Permissions: staring a package depends of the publish and unpublish permissions, there is no
|
||||
* specific flag for star or unstar.
|
||||
* The URL for star is similar to the unpublish (change package format)
|
||||
*
|
||||
* npm has no endpoint for star a package, rather mutate the metadata and acts as, the difference
|
||||
* npm has no endpoint for staring a package, rather mutate the metadata and acts as, the difference
|
||||
* is the users property which is part of the payload and the body only includes
|
||||
*
|
||||
* {
|
||||
@@ -89,7 +89,24 @@ const debug = buildDebug('verdaccio:api:publish');
|
||||
"users": {
|
||||
[username]: boolean value (true, false)
|
||||
}
|
||||
}
|
||||
}
|
||||
*
|
||||
* 4. Change owners of a package
|
||||
*
|
||||
* Similar to staring a package, changing owners (maintainers) of a package uses the publish
|
||||
* endpoint.
|
||||
*
|
||||
* The body includes a list of the new owners with the following format
|
||||
*
|
||||
* {
|
||||
"_id": pkgName,
|
||||
"_rev": "4-b0cdaefc9bdb77c8",
|
||||
"maintainers": [
|
||||
{ "name": "first owner", "email": "me@verdaccio.org" },
|
||||
{ "name": "second owner", "email": "you@verdaccio.org" },
|
||||
...
|
||||
]
|
||||
}
|
||||
*
|
||||
*/
|
||||
export default function publish(router: Router, auth: Auth, storage: Storage): void {
|
||||
@@ -127,10 +144,11 @@ export default function publish(router: Router, auth: Auth, storage: Storage): v
|
||||
async function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) {
|
||||
const packageName = req.params.package;
|
||||
const rev = req.params.revision;
|
||||
const username = req?.remote_user?.name;
|
||||
|
||||
logger.debug({ packageName }, `unpublishing @{packageName}`);
|
||||
try {
|
||||
await storage.removePackage(packageName, rev);
|
||||
await storage.removePackage(packageName, rev, username);
|
||||
debug('package %s unpublished', packageName);
|
||||
res.status(HTTP_STATUS.CREATED);
|
||||
return next({ ok: API_MESSAGE.PKG_REMOVED });
|
||||
@@ -155,13 +173,14 @@ export default function publish(router: Router, auth: Auth, storage: Storage): v
|
||||
): Promise<void> {
|
||||
const packageName = req.params.package;
|
||||
const { filename, revision } = req.params;
|
||||
const username = req?.remote_user?.name;
|
||||
|
||||
logger.debug(
|
||||
{ packageName, filename, revision },
|
||||
`removing a tarball for @{packageName}-@{tarballName}-@{revision}`
|
||||
);
|
||||
try {
|
||||
await storage.removeTarball(packageName, filename, revision);
|
||||
await storage.removeTarball(packageName, filename, revision, username);
|
||||
res.status(HTTP_STATUS.CREATED);
|
||||
|
||||
logger.debug(
|
||||
@@ -188,6 +207,12 @@ export function publishPackage(storage: Storage): any {
|
||||
const metadata = req.body;
|
||||
const username = req?.remote_user?.name;
|
||||
|
||||
debug('publishing package %o for user %o', packageName, username);
|
||||
logger.debug(
|
||||
{ packageName, username },
|
||||
'publishing package @{packageName} for user @{username}'
|
||||
);
|
||||
|
||||
try {
|
||||
const message = await storage.updateManifest(metadata, {
|
||||
name: packageName,
|
||||
|
||||
@@ -27,10 +27,22 @@ export default function (route: Router, auth: Auth, config: Config): void {
|
||||
rateLimit(config?.userRateLimit),
|
||||
function (req: $RequestExtend, res: Response, next: $NextFunctionVer): void {
|
||||
debug('verifying user');
|
||||
|
||||
if (typeof req.remote_user.name !== 'string' || req.remote_user.name === '') {
|
||||
debug('user not logged in');
|
||||
res.status(HTTP_STATUS.OK);
|
||||
return next({ ok: false });
|
||||
}
|
||||
|
||||
const username = req.params.org_couchdb_user.split(':')[1];
|
||||
const message = getAuthenticatedMessage(req.remote_user.name);
|
||||
debug('user authenticated message %o', message);
|
||||
res.status(HTTP_STATUS.OK);
|
||||
next({
|
||||
// 'npm owner' requires user info
|
||||
// TODO: we don't have the email
|
||||
name: username,
|
||||
email: '',
|
||||
ok: message,
|
||||
});
|
||||
}
|
||||
@@ -61,6 +73,10 @@ export default function (route: Router, auth: Auth, config: Config): void {
|
||||
debug('login or adduser');
|
||||
const remoteName = req?.remote_user?.name;
|
||||
|
||||
if (!validatioUtils.validateUserName(req.params.org_couchdb_user, name)) {
|
||||
return next(errorUtils.getBadRequest(API_ERROR.USERNAME_MISMATCH));
|
||||
}
|
||||
|
||||
if (typeof remoteName !== 'undefined' && typeof name === 'string' && remoteName === name) {
|
||||
debug('login: no remote user detected');
|
||||
auth.authenticate(
|
||||
@@ -97,6 +113,7 @@ export default function (route: Router, auth: Auth, config: Config): void {
|
||||
}
|
||||
);
|
||||
} else {
|
||||
debug('adduser: %o', name);
|
||||
if (
|
||||
validatioUtils.validatePassword(
|
||||
password,
|
||||
|
||||
@@ -11,7 +11,7 @@ import {
|
||||
generatePackageMetadata,
|
||||
initializeServer as initializeServerHelper,
|
||||
} from '@verdaccio/test-helper';
|
||||
import { GenericBody, PackageUsers } from '@verdaccio/types';
|
||||
import { Author, GenericBody, PackageUsers } from '@verdaccio/types';
|
||||
import { buildToken, generateRandomHexString } from '@verdaccio/utils';
|
||||
|
||||
import apiMiddleware from '../../src';
|
||||
@@ -142,6 +142,37 @@ export function starPackage(
|
||||
return test;
|
||||
}
|
||||
|
||||
export function changeOwners(
|
||||
app,
|
||||
options: {
|
||||
maintainers: Author[];
|
||||
name: string;
|
||||
_rev: string;
|
||||
_id?: string;
|
||||
},
|
||||
token?: string
|
||||
): supertest.Test {
|
||||
const { _rev, _id, maintainers } = options;
|
||||
const ownerManifest = {
|
||||
_rev,
|
||||
_id,
|
||||
maintainers,
|
||||
};
|
||||
|
||||
const test = supertest(app)
|
||||
.put(`/${encodeURIComponent(options.name)}`)
|
||||
.set(HEADER_TYPE.CONTENT_TYPE, HEADERS.JSON)
|
||||
.send(JSON.stringify(ownerManifest))
|
||||
.set('accept', HEADERS.GZIP)
|
||||
.set(HEADER_TYPE.ACCEPT_ENCODING, HEADERS.JSON);
|
||||
|
||||
if (typeof token === 'string') {
|
||||
test.set(HEADERS.AUTHORIZATION, buildToken(TOKEN_BEARER, token));
|
||||
}
|
||||
|
||||
return test;
|
||||
}
|
||||
|
||||
export function getDisTags(app, pkgName) {
|
||||
return supertest(app)
|
||||
.get(`/-/package/${encodeURIComponent(pkgName)}/dist-tags`)
|
||||
|
||||
24
packages/api/test/integration/config/owner.yaml
Normal file
24
packages/api/test/integration/config/owner.yaml
Normal file
@@ -0,0 +1,24 @@
|
||||
storage: ./storage
|
||||
|
||||
auth:
|
||||
htpasswd:
|
||||
file: ./htpasswd-owner
|
||||
|
||||
web:
|
||||
enable: true
|
||||
title: verdaccio
|
||||
|
||||
log: { type: stdout, format: pretty, level: info }
|
||||
|
||||
# TODO: Add test case for $owner access
|
||||
packages:
|
||||
'@*/*':
|
||||
access: $all
|
||||
publish: $authenticated
|
||||
unpublish: $authenticated
|
||||
'**':
|
||||
access: $all
|
||||
publish: $authenticated
|
||||
unpublish: $authenticated
|
||||
|
||||
_debug: true
|
||||
118
packages/api/test/integration/owner.spec.ts
Normal file
118
packages/api/test/integration/owner.spec.ts
Normal file
@@ -0,0 +1,118 @@
|
||||
/* eslint-disable jest/no-commented-out-tests */
|
||||
import nock from 'nock';
|
||||
|
||||
import { HTTP_STATUS } from '@verdaccio/core';
|
||||
|
||||
import {
|
||||
changeOwners,
|
||||
createUser,
|
||||
getPackage,
|
||||
initializeServer,
|
||||
publishVersionWithToken,
|
||||
} from './_helper';
|
||||
|
||||
describe('owner', () => {
|
||||
test.each([['foo', '@scope%2Ffoo']])('should get owner of package', async (pkgName) => {
|
||||
nock('https://registry.npmjs.org').get(`/${pkgName}`).reply(404);
|
||||
const app = await initializeServer('owner.yaml');
|
||||
const credentials = { name: 'test', password: 'test' };
|
||||
const response = await createUser(app, credentials.name, credentials.password);
|
||||
expect(response.body.ok).toMatch(`user '${credentials.name}' created`);
|
||||
await publishVersionWithToken(app, pkgName, '1.0.0', response.body.token).expect(
|
||||
HTTP_STATUS.CREATED
|
||||
);
|
||||
|
||||
// expect publish to set owner to logged in user
|
||||
const manifest = await getPackage(app, '', decodeURIComponent(pkgName));
|
||||
const maintainers = manifest.body.maintainers;
|
||||
expect(maintainers).toHaveLength(1);
|
||||
// TODO: This should eventually include the email of the user
|
||||
expect(maintainers).toEqual([{ name: credentials.name, email: '' }]);
|
||||
});
|
||||
|
||||
test.each([['foo', '@scope%2Ffoo']])('should add/remove owner to package', async (pkgName) => {
|
||||
nock('https://registry.npmjs.org').get(`/${pkgName}`).reply(404);
|
||||
const app = await initializeServer('owner.yaml');
|
||||
const credentials = { name: 'test', password: 'test' };
|
||||
const firstOwner = { name: 'test', email: '' };
|
||||
const response = await createUser(app, credentials.name, credentials.password);
|
||||
expect(response.body.ok).toMatch(`user '${credentials.name}' created`);
|
||||
await publishVersionWithToken(app, pkgName, '1.0.0', response.body.token).expect(
|
||||
HTTP_STATUS.CREATED
|
||||
);
|
||||
|
||||
// publish sets owner to logged in user
|
||||
const manifest = await getPackage(app, '', decodeURIComponent(pkgName));
|
||||
const maintainers = manifest.body.maintainers;
|
||||
expect(maintainers).toHaveLength(1);
|
||||
expect(maintainers).toEqual([firstOwner]);
|
||||
|
||||
// add another owner
|
||||
const secondOwner = { name: 'tester', email: 'test@verdaccio.org' };
|
||||
const newOwners = [...maintainers, secondOwner];
|
||||
await changeOwners(
|
||||
app,
|
||||
{
|
||||
_rev: manifest.body._rev,
|
||||
_id: manifest.body._id,
|
||||
name: pkgName,
|
||||
maintainers: newOwners,
|
||||
},
|
||||
response.body.token
|
||||
).expect(HTTP_STATUS.CREATED);
|
||||
|
||||
const manifest2 = await getPackage(app, '', decodeURIComponent(pkgName));
|
||||
const maintainers2 = manifest2.body.maintainers;
|
||||
expect(maintainers2).toHaveLength(2);
|
||||
expect(maintainers2).toEqual([firstOwner, secondOwner]);
|
||||
|
||||
// remove original owner
|
||||
await changeOwners(
|
||||
app,
|
||||
{
|
||||
_rev: manifest2.body._rev,
|
||||
_id: manifest2.body._id,
|
||||
name: pkgName,
|
||||
maintainers: [secondOwner],
|
||||
},
|
||||
response.body.token
|
||||
).expect(HTTP_STATUS.CREATED);
|
||||
|
||||
const manifest3 = await getPackage(app, '', decodeURIComponent(pkgName));
|
||||
const maintainers3 = manifest3.body.maintainers;
|
||||
expect(maintainers3).toHaveLength(1);
|
||||
expect(maintainers3).toEqual([secondOwner]);
|
||||
});
|
||||
|
||||
test.each([['foo', '@scope%2Ffoo']])('should fail if user is not logged in', async (pkgName) => {
|
||||
nock('https://registry.npmjs.org').get(`/${pkgName}`).reply(404);
|
||||
const app = await initializeServer('owner.yaml');
|
||||
const credentials = { name: 'test', password: 'test' };
|
||||
const firstOwner = { name: 'test', email: '' };
|
||||
const response = await createUser(app, credentials.name, credentials.password);
|
||||
expect(response.body.ok).toMatch(`user '${credentials.name}' created`);
|
||||
await publishVersionWithToken(app, pkgName, '1.0.0', response.body.token).expect(
|
||||
HTTP_STATUS.CREATED
|
||||
);
|
||||
|
||||
// publish sets owner to logged in user
|
||||
const manifest = await getPackage(app, '', decodeURIComponent(pkgName));
|
||||
const maintainers = manifest.body.maintainers;
|
||||
expect(maintainers).toHaveLength(1);
|
||||
expect(maintainers).toEqual([firstOwner]);
|
||||
|
||||
// try adding another owner
|
||||
const secondOwner = { name: 'tester', email: 'test@verdaccio.org' };
|
||||
const newOwners = [...maintainers, secondOwner];
|
||||
await changeOwners(
|
||||
app,
|
||||
{
|
||||
_rev: manifest.body._rev,
|
||||
_id: manifest.body._id,
|
||||
name: pkgName,
|
||||
maintainers: newOwners,
|
||||
},
|
||||
'' // no token
|
||||
).expect(HTTP_STATUS.UNAUTHORIZED);
|
||||
});
|
||||
});
|
||||
@@ -43,6 +43,12 @@ describe('search', () => {
|
||||
links: {
|
||||
npm: '',
|
||||
},
|
||||
maintainers: [
|
||||
{
|
||||
email: '',
|
||||
name: 'test',
|
||||
},
|
||||
],
|
||||
name: pkg,
|
||||
publisher: {},
|
||||
scope: '',
|
||||
@@ -97,6 +103,12 @@ describe('search', () => {
|
||||
links: {
|
||||
npm: '',
|
||||
},
|
||||
maintainers: [
|
||||
{
|
||||
email: '',
|
||||
name: 'test',
|
||||
},
|
||||
],
|
||||
name: pkg,
|
||||
publisher: {},
|
||||
scope: '@scope',
|
||||
|
||||
@@ -148,6 +148,25 @@ describe('token', () => {
|
||||
.expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.JSON_CHARSET)
|
||||
.expect(HTTP_STATUS.OK);
|
||||
expect(response2.body.ok).toBe(`you are authenticated as '${credentials.name}'`);
|
||||
expect(response2.body.name).toBe(credentials.name);
|
||||
}
|
||||
);
|
||||
|
||||
test.each([['user.yaml'], ['user.jwt.yaml']])(
|
||||
'should return name of requested user',
|
||||
async (conf) => {
|
||||
const app = await initializeServer(conf);
|
||||
const username = 'yeti';
|
||||
const credentials = { name: 'jota', password: 'secretPass' };
|
||||
const response = await createUser(app, credentials.name, credentials.password);
|
||||
expect(response.body.ok).toMatch(`user '${credentials.name}' created`);
|
||||
const response3 = await supertest(app)
|
||||
.get(`/-/user/org.couchdb.user:${username}`)
|
||||
.set(HEADERS.AUTHORIZATION, buildToken(TOKEN_BEARER, response.body.token))
|
||||
.expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.JSON_CHARSET)
|
||||
.expect(HTTP_STATUS.OK);
|
||||
expect(response3.body.ok).toBe(`you are authenticated as '${credentials.name}'`);
|
||||
expect(response3.body.name).toBe(username);
|
||||
}
|
||||
);
|
||||
|
||||
@@ -165,5 +184,38 @@ describe('token', () => {
|
||||
.expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.JSON_CHARSET)
|
||||
.expect(HTTP_STATUS.OK);
|
||||
});
|
||||
|
||||
test.each([['user.yaml'], ['user.jwt.yaml']])(
|
||||
'should return "false" if user is not logged in',
|
||||
async (conf) => {
|
||||
const app = await initializeServer(conf);
|
||||
const credentials = { name: 'jota', password: '' };
|
||||
const response = await supertest(app)
|
||||
.get(`/-/user/org.couchdb.user:${credentials.name}`)
|
||||
.expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.JSON_CHARSET)
|
||||
.expect(HTTP_STATUS.OK);
|
||||
expect(response.body.ok).toBe(false);
|
||||
}
|
||||
);
|
||||
|
||||
test.each([['user.yaml'], ['user.jwt.yaml']])(
|
||||
'should fail if URL does not match user in request body',
|
||||
async (conf) => {
|
||||
const app = await initializeServer(conf);
|
||||
const credentials = { name: 'jota', password: 'secretPass' };
|
||||
const response = await createUser(app, credentials.name, credentials.password);
|
||||
expect(response.body.ok).toMatch(`user '${credentials.name}' created`);
|
||||
const response2 = await supertest(app)
|
||||
.put('/-/user/org.couchdb.user:yeti') // different user
|
||||
.set(HEADERS.AUTHORIZATION, buildToken(TOKEN_BEARER, response.body.token))
|
||||
.send({
|
||||
name: credentials.name,
|
||||
password: credentials.password,
|
||||
})
|
||||
.expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.JSON_CHARSET)
|
||||
.expect(HTTP_STATUS.BAD_REQUEST);
|
||||
expect(response2.body.error).toBe(API_ERROR.USERNAME_MISMATCH);
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,5 +1,56 @@
|
||||
# @verdaccio/auth
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
- @verdaccio/config@7.0.0-next-7.20
|
||||
- @verdaccio/loaders@7.0.0-next-7.20
|
||||
- verdaccio-htpasswd@12.0.0-next-7.20
|
||||
- @verdaccio/utils@7.0.0-next-7.20
|
||||
- @verdaccio/signature@7.0.0-next-7.5
|
||||
- @verdaccio/logger@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [c31aec8]
|
||||
- @verdaccio/config@7.0.0-next-7.19
|
||||
- @verdaccio/loaders@7.0.0-next-7.19
|
||||
- verdaccio-htpasswd@12.0.0-next-7.19
|
||||
- @verdaccio/signature@7.0.0-next-7.5
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
- @verdaccio/utils@7.0.0-next-7.19
|
||||
- @verdaccio/logger@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [10dd81f]
|
||||
- @verdaccio/config@7.0.0-next-7.18
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
- @verdaccio/loaders@7.0.0-next-7.18
|
||||
- @verdaccio/logger@7.0.0-next-7.18
|
||||
- verdaccio-htpasswd@12.0.0-next-7.18
|
||||
- @verdaccio/signature@7.0.0-next-7.5
|
||||
- @verdaccio/utils@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [6e764e3]
|
||||
- @verdaccio/config@7.0.0-next-7.17
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
- @verdaccio/loaders@7.0.0-next-7.17
|
||||
- @verdaccio/logger@7.0.0-next-7.17
|
||||
- verdaccio-htpasswd@12.0.0-next-7.17
|
||||
- @verdaccio/signature@7.0.0-next-7.5
|
||||
- @verdaccio/utils@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/auth",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"description": "logger",
|
||||
"main": "./build/index.js",
|
||||
"types": "./build/index.d.ts",
|
||||
@@ -38,21 +38,21 @@
|
||||
},
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/loaders": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/loaders": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/signature": "workspace:7.0.0-next-7.5",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.20",
|
||||
"debug": "4.3.4",
|
||||
"lodash": "4.17.21",
|
||||
"verdaccio-htpasswd": "workspace:12.0.0-next-7.16"
|
||||
"verdaccio-htpasswd": "workspace:12.0.0-next-7.20"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/middleware": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5",
|
||||
"express": "4.19.2",
|
||||
"supertest": "6.3.4",
|
||||
"@verdaccio/middleware": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3"
|
||||
"supertest": "7.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
|
||||
@@ -1,5 +1,46 @@
|
||||
# @verdaccio/cli
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/node-api@7.0.0-next-7.20
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
- @verdaccio/config@7.0.0-next-7.20
|
||||
- @verdaccio/logger@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [c31aec8]
|
||||
- @verdaccio/config@7.0.0-next-7.19
|
||||
- @verdaccio/node-api@7.0.0-next-7.19
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
- @verdaccio/logger@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 10dd81f: feat: complete overhaul of web user interface
|
||||
- Updated dependencies [10dd81f]
|
||||
- @verdaccio/config@7.0.0-next-7.18
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
- @verdaccio/logger@7.0.0-next-7.18
|
||||
- @verdaccio/node-api@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 199aea3: chore: add config location and loglevel to startup log
|
||||
- Updated dependencies [6e764e3]
|
||||
- @verdaccio/config@7.0.0-next-7.17
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
- @verdaccio/logger@7.0.0-next-7.17
|
||||
- @verdaccio/node-api@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/cli",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"author": {
|
||||
"name": "Juan Picado",
|
||||
"email": "juanpicado19@gmail.com"
|
||||
@@ -43,14 +43,14 @@
|
||||
"start": "ts-node src/index.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/node-api": "workspace:7.0.0-next-7.16",
|
||||
"clipanion": "3.2.1",
|
||||
"envinfo": "7.11.0",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/node-api": "workspace:7.0.0-next-7.20",
|
||||
"clipanion": "4.0.0-rc.3",
|
||||
"envinfo": "7.13.0",
|
||||
"kleur": "4.1.5",
|
||||
"semver": "7.6.0"
|
||||
"semver": "7.6.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"ts-node": "10.9.2"
|
||||
|
||||
@@ -58,6 +58,8 @@ export class InitCommand extends Command {
|
||||
const configPathLocation = findConfigFile(this.config as string);
|
||||
const configParsed = parseConfigFile(configPathLocation);
|
||||
this.initLogger(configParsed);
|
||||
logger.info({ file: configPathLocation }, 'using config file: @{file}');
|
||||
logger.info('log level: %s', configParsed.log?.level || 'default');
|
||||
const { web } = configParsed;
|
||||
|
||||
process.title = web?.title || DEFAULT_PROCESS_NAME;
|
||||
|
||||
@@ -1,5 +1,37 @@
|
||||
# @verdaccio/config
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
- @verdaccio/utils@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- c31aec8: fix: typo in config docs regarding check_owners
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
- @verdaccio/utils@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 10dd81f: feat: complete overhaul of web user interface
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
- @verdaccio/utils@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 6e764e3: feat: add support for npm owner
|
||||
- Updated dependencies [6e764e3]
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
- @verdaccio/utils@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/config",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"description": "logger",
|
||||
"main": "./build/index.js",
|
||||
"types": "build/index.d.ts",
|
||||
@@ -38,17 +38,15 @@
|
||||
"build": "pnpm run build:js && pnpm run build:types"
|
||||
},
|
||||
"dependencies": {
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.20",
|
||||
"debug": "4.3.4",
|
||||
"js-yaml": "4.1.0",
|
||||
"lodash": "4.17.21",
|
||||
"minimatch": "7.4.6",
|
||||
"yup": "0.32.11"
|
||||
"minimatch": "7.4.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/minimatch": "5.1.2",
|
||||
"@types/yup": "0.32.0"
|
||||
"@types/minimatch": "5.1.2"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
|
||||
@@ -18,6 +18,12 @@ storage: ./storage
|
||||
# https://verdaccio.org/docs/webui
|
||||
web:
|
||||
title: Verdaccio
|
||||
# custom colors for header background and font
|
||||
# primaryColor: "#4b5e40"
|
||||
# custom logos and favicon
|
||||
# logo: ./path/to/logo.png
|
||||
# logoDark: ./path/to/logoDark.png
|
||||
# favicon: ./path/to/favicon.ico
|
||||
# comment out to disable gravatar support
|
||||
# gravatar: false
|
||||
# by default packages are ordercer ascendant (asc|desc)
|
||||
@@ -35,6 +41,7 @@ web:
|
||||
# showSearch: true
|
||||
# showRaw: true
|
||||
# showDownloadTarball: true
|
||||
# showUplinks: true
|
||||
# HTML tags injected after manifest <scripts/>
|
||||
# scriptsBodyAfter:
|
||||
# - '<script type="text/javascript" src="https://my.company.com/customJS.min.js"></script>'
|
||||
@@ -113,6 +120,7 @@ server:
|
||||
# https://verdaccio.org/docs/configuration#offline-publish
|
||||
# publish:
|
||||
# allow_offline: false
|
||||
# check_owners: false
|
||||
|
||||
# https://verdaccio.org/docs/configuration#url-prefix
|
||||
# url_prefix: /verdaccio/
|
||||
@@ -179,6 +187,7 @@ server:
|
||||
middlewares:
|
||||
audit:
|
||||
enabled: true
|
||||
# timeout: 10000
|
||||
|
||||
# https://verdaccio.org/docs/logger
|
||||
# log settings
|
||||
|
||||
@@ -21,6 +21,12 @@ plugins: /verdaccio/plugins
|
||||
# https://verdaccio.org/docs/webui
|
||||
web:
|
||||
title: Verdaccio
|
||||
# custom colors for header background and font
|
||||
# primaryColor: "#4b5e40"
|
||||
# custom logos and favicon
|
||||
# logo: ./path/to/logo.png
|
||||
# logoDark: ./path/to/logoDark.png
|
||||
# favicon: ./path/to/favicon.ico
|
||||
# Comment out to disable gravatar support
|
||||
# gravatar: false
|
||||
# By default packages are ordered ascendant (asc|desc)
|
||||
@@ -38,6 +44,7 @@ web:
|
||||
# showSearch: true
|
||||
# showRaw: true
|
||||
# showDownloadTarball: true
|
||||
# showUplinks: true
|
||||
# HTML tags injected after manifest <scripts/>
|
||||
# scriptsBodyAfter:
|
||||
# - '<script type="text/javascript" src="https://my.company.com/customJS.min.js"></script>'
|
||||
@@ -119,6 +126,7 @@ server:
|
||||
# https://verdaccio.org/docs/configuration#offline-publish
|
||||
# publish:
|
||||
# allow_offline: false
|
||||
# check_owners: false
|
||||
|
||||
# https://verdaccio.org/docs/configuration#url-prefix
|
||||
# url_prefix: /verdaccio/
|
||||
@@ -185,6 +193,7 @@ server:
|
||||
middlewares:
|
||||
audit:
|
||||
enabled: true
|
||||
# timeout: 10000
|
||||
|
||||
# https://verdaccio.org/docs/logger
|
||||
# log settings
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
# @verdaccio/core
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 6e764e3: feat: add support for npm owner
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
## 7.0.0-next-7.15
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/core",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"description": "core utilities",
|
||||
"keywords": [
|
||||
"private",
|
||||
@@ -33,18 +33,18 @@
|
||||
"access": "public"
|
||||
},
|
||||
"dependencies": {
|
||||
"ajv": "8.12.0",
|
||||
"core-js": "3.35.0",
|
||||
"http-errors": "2.0.0",
|
||||
"http-status-codes": "2.3.0",
|
||||
"semver": "7.6.0",
|
||||
"ajv": "8.12.0",
|
||||
"process-warning": "1.0.0",
|
||||
"core-js": "3.35.0"
|
||||
"semver": "7.6.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5",
|
||||
"lodash": "4.17.21",
|
||||
"typedoc": "0.23.25",
|
||||
"typedoc-plugin-missing-exports": "latest",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3"
|
||||
"typedoc-plugin-missing-exports": "latest"
|
||||
},
|
||||
"scripts": {
|
||||
"clean": "rimraf ./build",
|
||||
|
||||
@@ -6,6 +6,7 @@ export const TIME_EXPIRATION_1H = '1h';
|
||||
export const DIST_TAGS = 'dist-tags';
|
||||
export const LATEST = 'latest';
|
||||
export const USERS = 'users';
|
||||
export const MAINTAINERS = 'maintainers';
|
||||
export const DEFAULT_USER = 'Anonymous';
|
||||
|
||||
export const HEADER_TYPE = {
|
||||
|
||||
@@ -39,6 +39,7 @@ export const API_ERROR = {
|
||||
BAD_PACKAGE_DATA: 'bad incoming package data',
|
||||
USERNAME_PASSWORD_REQUIRED: 'username and password is required',
|
||||
USERNAME_ALREADY_REGISTERED: 'username is already registered',
|
||||
USERNAME_MISMATCH: 'username does not match logged in user',
|
||||
};
|
||||
|
||||
export const SUPPORT_ERRORS = {
|
||||
|
||||
@@ -23,6 +23,7 @@ export {
|
||||
DEFAULT_PASSWORD_VALIDATION,
|
||||
DEFAULT_USER,
|
||||
USERS,
|
||||
MAINTAINERS,
|
||||
HtpasswdHashAlgorithm,
|
||||
} from './constants';
|
||||
const validationUtils = validatioUtils;
|
||||
|
||||
@@ -2,7 +2,7 @@ import assert from 'assert';
|
||||
|
||||
import { Manifest } from '@verdaccio/types';
|
||||
|
||||
import { DEFAULT_PASSWORD_VALIDATION, DIST_TAGS } from './constants';
|
||||
import { DEFAULT_PASSWORD_VALIDATION, DIST_TAGS, MAINTAINERS } from './constants';
|
||||
|
||||
export { validatePublishSingleVersion } from './schemes/publish-manifest';
|
||||
|
||||
@@ -67,7 +67,6 @@ export function validatePackage(name: string): boolean {
|
||||
* @param {*} manifest
|
||||
* @param {*} name
|
||||
* @return {Object} the object with additional properties as dist-tags ad versions
|
||||
* FUTURE: rename to normalizeMetadata
|
||||
*/
|
||||
export function normalizeMetadata(manifest: Manifest, name: string): Manifest {
|
||||
assert.strictEqual(manifest.name, name);
|
||||
@@ -77,7 +76,11 @@ export function normalizeMetadata(manifest: Manifest, name: string): Manifest {
|
||||
_manifest[DIST_TAGS] = {};
|
||||
}
|
||||
|
||||
// This may not be nee dit
|
||||
if (!Array.isArray(manifest[MAINTAINERS])) {
|
||||
_manifest[MAINTAINERS] = [];
|
||||
}
|
||||
|
||||
// This may not be needed
|
||||
if (!isObject(manifest['versions'])) {
|
||||
_manifest['versions'] = {};
|
||||
}
|
||||
@@ -114,3 +117,11 @@ export function validatePassword(
|
||||
? password.match(validation) !== null
|
||||
: false;
|
||||
}
|
||||
|
||||
export function validateUserName(userName: any, expectedName: string): boolean {
|
||||
return (
|
||||
typeof userName === 'string' &&
|
||||
userName.split(':')[0] === 'org.couchdb.user' &&
|
||||
userName.split(':')[1] === expectedName
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import {
|
||||
validateName,
|
||||
validatePackage,
|
||||
validatePassword,
|
||||
validateUserName,
|
||||
} from '../src/validation-utils';
|
||||
|
||||
describe('validatePackage', () => {
|
||||
@@ -224,3 +225,17 @@ describe('validatePassword', () => {
|
||||
expect(validatePassword('1235678910')).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
||||
describe('validateUserName', () => {
|
||||
test('should validate username according to expected name', () => {
|
||||
expect(validateUserName('org.couchdb.user:test', 'test')).toBeTruthy();
|
||||
});
|
||||
|
||||
test('should fail to validate username if different from expected name', () => {
|
||||
expect(validateUserName('org.couchdb.user:foouser', 'test')).toBeFalsy();
|
||||
});
|
||||
|
||||
test('should fail to validate username if not given', () => {
|
||||
expect(validateUserName(undefined, 'test')).toBeFalsy();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
"lockfile": "1.0.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3"
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5"
|
||||
},
|
||||
"scripts": {
|
||||
"clean": "rimraf ./build",
|
||||
|
||||
@@ -1,5 +1,39 @@
|
||||
# Change Log
|
||||
|
||||
## 12.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [ccc7bd1]
|
||||
- @verdaccio/url@12.0.0-next-7.20
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
- @verdaccio/utils@7.0.0-next-7.20
|
||||
|
||||
## 12.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
- @verdaccio/url@12.0.0-next-7.19
|
||||
- @verdaccio/utils@7.0.0-next-7.19
|
||||
|
||||
## 12.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
- @verdaccio/url@12.0.0-next-7.18
|
||||
- @verdaccio/utils@7.0.0-next-7.18
|
||||
|
||||
## 12.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [6e764e3]
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
- @verdaccio/url@12.0.0-next-7.17
|
||||
- @verdaccio/utils@7.0.0-next-7.17
|
||||
|
||||
## 12.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/tarball",
|
||||
"version": "12.0.0-next-7.16",
|
||||
"version": "12.0.0-next-7.20",
|
||||
"description": "tarball utilities resolver",
|
||||
"keywords": [
|
||||
"private",
|
||||
@@ -33,16 +33,16 @@
|
||||
"access": "public"
|
||||
},
|
||||
"dependencies": {
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/url": "workspace:12.0.0-next-7.16",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/url": "workspace:12.0.0-next-7.20",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.20",
|
||||
"debug": "4.3.4",
|
||||
"gunzip-maybe": "^1.4.2",
|
||||
"lodash": "4.17.21",
|
||||
"tar-stream": "^3.1.7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5",
|
||||
"node-mocks-http": "1.14.1"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@@ -1,5 +1,19 @@
|
||||
# Change Log
|
||||
|
||||
## 12.0.0-next-7.5
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 10dd81f: feat: complete overhaul of web user interface
|
||||
|
||||
## 12.0.0-next-7.4
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 6e764e3: feat: add support for npm owner
|
||||
- de6ff5c: fix: update fields for abbreviated manifest
|
||||
- 117eb1c: fix: change bundleDependencies to array
|
||||
|
||||
## 12.0.0-next-7.3
|
||||
|
||||
### Minor Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/types",
|
||||
"version": "12.0.0-next-7.3",
|
||||
"version": "12.0.0-next-7.5",
|
||||
"description": "verdaccio types definitions",
|
||||
"keywords": [
|
||||
"private",
|
||||
|
||||
@@ -83,6 +83,7 @@ export type PackageManagers = 'pnpm' | 'yarn' | 'npm';
|
||||
export type CommonWebConf = {
|
||||
title?: string;
|
||||
logo?: string;
|
||||
logoDark?: string;
|
||||
favicon?: string;
|
||||
gravatar?: boolean;
|
||||
sort_packages?: string;
|
||||
@@ -98,6 +99,7 @@ export type CommonWebConf = {
|
||||
showFooter?: boolean;
|
||||
showThemeSwitch?: boolean;
|
||||
showDownloadTarball?: boolean;
|
||||
showUplinks?: boolean;
|
||||
hideDeprecatedVersions?: boolean;
|
||||
primaryColor: string;
|
||||
showRaw?: boolean;
|
||||
@@ -196,6 +198,7 @@ export interface Security {
|
||||
|
||||
export interface PublishOptions {
|
||||
allow_offline: boolean;
|
||||
check_owners: boolean;
|
||||
}
|
||||
|
||||
export interface ListenAddress {
|
||||
|
||||
@@ -123,7 +123,8 @@ export interface Version {
|
||||
devDependencies?: Dependencies;
|
||||
optionalDependencies?: Dependencies;
|
||||
peerDependenciesMeta?: PeerDependenciesMeta;
|
||||
bundleDependencies?: Dependencies;
|
||||
bundleDependencies?: string[];
|
||||
acceptDependencies?: Dependencies;
|
||||
keywords?: string | string[];
|
||||
nodeVersion?: string;
|
||||
_id: string;
|
||||
@@ -178,7 +179,9 @@ export interface FullRemoteManifest {
|
||||
'dist-tags': GenericBody;
|
||||
time: GenericBody;
|
||||
versions: Versions;
|
||||
/** store owners of this package */
|
||||
maintainers?: Author[];
|
||||
contributors?: Author[];
|
||||
/** store the latest readme **/
|
||||
readme?: string;
|
||||
/** store star assigned to this packages by users */
|
||||
@@ -223,7 +226,6 @@ export type AbbreviatedVersion = Pick<
|
||||
Version,
|
||||
| 'name'
|
||||
| 'version'
|
||||
| 'description'
|
||||
| 'dependencies'
|
||||
| 'devDependencies'
|
||||
| 'bin'
|
||||
@@ -231,6 +233,15 @@ export type AbbreviatedVersion = Pick<
|
||||
| 'engines'
|
||||
| 'funding'
|
||||
| 'peerDependencies'
|
||||
| 'cpu'
|
||||
| 'deprecated'
|
||||
| 'directories'
|
||||
| 'hasInstallScript'
|
||||
| 'optionalDependencies'
|
||||
| 'os'
|
||||
| 'peerDependenciesMeta'
|
||||
| 'acceptDependencies'
|
||||
| '_hasShrinkwrap'
|
||||
>;
|
||||
|
||||
export interface AbbreviatedVersions {
|
||||
|
||||
@@ -1,5 +1,31 @@
|
||||
# Change Log
|
||||
|
||||
## 12.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- ccc7bd1: fix(middleware): link to favicon in template
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
|
||||
## 12.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
|
||||
## 12.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
|
||||
## 12.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [6e764e3]
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
|
||||
## 12.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/url",
|
||||
"version": "12.0.0-next-7.16",
|
||||
"version": "12.0.0-next-7.20",
|
||||
"description": "url utilities resolver",
|
||||
"keywords": [
|
||||
"private",
|
||||
@@ -33,13 +33,13 @@
|
||||
"access": "public"
|
||||
},
|
||||
"dependencies": {
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"debug": "4.3.4",
|
||||
"lodash": "4.17.21",
|
||||
"validator": "13.11.0"
|
||||
"validator": "13.12.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5",
|
||||
"node-mocks-http": "1.14.1"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@@ -102,7 +102,7 @@ describe('host', () => {
|
||||
});
|
||||
|
||||
expect(
|
||||
getPublicUrl(null, {
|
||||
getPublicUrl(undefined, {
|
||||
host: req.hostname,
|
||||
headers: req.headers as any,
|
||||
protocol: req.protocol,
|
||||
|
||||
@@ -1,5 +1,34 @@
|
||||
# @verdaccio/hooks
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
- @verdaccio/logger@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
- @verdaccio/logger@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
- @verdaccio/logger@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [6e764e3]
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
- @verdaccio/logger@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/hooks",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"description": "loaders logic",
|
||||
"main": "./build/index.js",
|
||||
"types": "build/index.d.ts",
|
||||
@@ -29,17 +29,17 @@
|
||||
"node": ">=18"
|
||||
},
|
||||
"dependencies": {
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.20",
|
||||
"core-js": "3.35.0",
|
||||
"debug": "4.3.4",
|
||||
"got-cjs": "12.5.4",
|
||||
"handlebars": "4.7.8"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/auth": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3",
|
||||
"@verdaccio/auth": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5",
|
||||
"nock": "13.5.1"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@@ -1,5 +1,29 @@
|
||||
# @verdaccio/loaders
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/loaders",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"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:7.0.0-next-7.16",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.20",
|
||||
"debug": "4.3.4",
|
||||
"lodash": "4.17.21"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5",
|
||||
"@verdaccio-scope/verdaccio-auth-foo": "0.0.2",
|
||||
"verdaccio-auth-memory": "workspace:*",
|
||||
"customprefix-auth": "2.0.0-next.0"
|
||||
|
||||
@@ -1,5 +1,29 @@
|
||||
# @verdaccio/logger-7
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger-commons@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger-commons@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger-commons@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger-commons@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/logger-7",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"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:7.0.0-next-7.16",
|
||||
"@verdaccio/logger-commons": "workspace:7.0.0-next-7.20",
|
||||
"pino": "7.11.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3"
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
|
||||
@@ -1,5 +1,30 @@
|
||||
# @verdaccio/logger-commons
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [6e764e3]
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/logger-commons",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"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:7.0.0-next-7.16",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/logger-prettify": "workspace:7.0.0-next-7.3",
|
||||
"debug": "4.3.4",
|
||||
"colorette": "2.0.20"
|
||||
},
|
||||
"devDependencies": {
|
||||
"pino": "7.11.0",
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3"
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
|
||||
@@ -1,5 +1,29 @@
|
||||
# @verdaccio/logger
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger-commons@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger-commons@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger-commons@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- @verdaccio/logger-commons@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/logger",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"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:7.0.0-next-7.16",
|
||||
"@verdaccio/logger-commons": "workspace:7.0.0-next-7.20",
|
||||
"pino": "8.17.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.3"
|
||||
"@verdaccio/types": "workspace:12.0.0-next-7.5"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
|
||||
@@ -1,5 +1,49 @@
|
||||
# @verdaccio/middleware
|
||||
|
||||
## 7.0.0-next-7.20
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- ccc7bd1: fix(middleware): link to favicon in template
|
||||
- Updated dependencies [ccc7bd1]
|
||||
- @verdaccio/url@12.0.0-next-7.20
|
||||
- @verdaccio/core@7.0.0-next-7.20
|
||||
- @verdaccio/config@7.0.0-next-7.20
|
||||
- @verdaccio/utils@7.0.0-next-7.20
|
||||
|
||||
## 7.0.0-next-7.19
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 2a6ee33: fix(middleware): custom favicon
|
||||
- 6c5f7a4: fix(middleware): link to favicon in template
|
||||
- Updated dependencies [c31aec8]
|
||||
- @verdaccio/config@7.0.0-next-7.19
|
||||
- @verdaccio/core@7.0.0-next-7.19
|
||||
- @verdaccio/url@12.0.0-next-7.19
|
||||
- @verdaccio/utils@7.0.0-next-7.19
|
||||
|
||||
## 7.0.0-next-7.18
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 10dd81f: feat: complete overhaul of web user interface
|
||||
- Updated dependencies [10dd81f]
|
||||
- @verdaccio/config@7.0.0-next-7.18
|
||||
- @verdaccio/core@7.0.0-next-7.18
|
||||
- @verdaccio/url@12.0.0-next-7.18
|
||||
- @verdaccio/utils@7.0.0-next-7.18
|
||||
|
||||
## 7.0.0-next-7.17
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [6e764e3]
|
||||
- @verdaccio/config@7.0.0-next-7.17
|
||||
- @verdaccio/core@7.0.0-next-7.17
|
||||
- @verdaccio/url@12.0.0-next-7.17
|
||||
- @verdaccio/utils@7.0.0-next-7.17
|
||||
|
||||
## 7.0.0-next-7.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@verdaccio/middleware",
|
||||
"version": "7.0.0-next-7.16",
|
||||
"version": "7.0.0-next-7.20",
|
||||
"description": "express middleware utils",
|
||||
"main": "./build/index.js",
|
||||
"types": "build/index.d.ts",
|
||||
@@ -35,27 +35,28 @@
|
||||
"build:js": "babel src/ --out-dir build/ --copy-files --extensions \".ts,.tsx\" --source-maps",
|
||||
"watch": "pnpm build:js -- --watch",
|
||||
"test": "jest",
|
||||
"test:snap": "jest --updateSnapshot",
|
||||
"build": "pnpm run build:js && pnpm run build:types"
|
||||
},
|
||||
"dependencies": {
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/url": "workspace:12.0.0-next-7.16",
|
||||
"@verdaccio/config": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/core": "workspace:7.0.0-next-7.20",
|
||||
"@verdaccio/url": "workspace:12.0.0-next-7.20",
|
||||
"@verdaccio/utils": "workspace:7.0.0-next-7.20",
|
||||
"debug": "4.3.4",
|
||||
"lru-cache": "7.18.3",
|
||||
"express": "4.19.2",
|
||||
"express-rate-limit": "5.5.1",
|
||||
"lodash": "4.17.21",
|
||||
"mime": "2.6.0",
|
||||
"express-rate-limit": "5.5.1"
|
||||
"lru-cache": "7.18.3",
|
||||
"mime": "2.6.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/verdaccio"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.16",
|
||||
"@verdaccio/logger": "workspace:7.0.0-next-7.20",
|
||||
"body-parser": "1.20.2",
|
||||
"supertest": "6.3.4"
|
||||
"supertest": "7.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,39 +37,59 @@ export function renderWebMiddleware(config, tokenMiddleware, pluginOptions) {
|
||||
// any match within the static is routed to the file system
|
||||
router.get('/-/static/*', function (req, res, next) {
|
||||
const filename = req.params[0];
|
||||
const file = `${staticPath}/${filename}`;
|
||||
let file = `${staticPath}/${filename}`;
|
||||
if (filename === 'favicon.ico' && config?.web?.favicon) {
|
||||
file = config?.web?.favicon;
|
||||
if (isURLhasValidProtocol(file)) {
|
||||
debug('redirect to favicon %s', file);
|
||||
req.url = file;
|
||||
return next();
|
||||
}
|
||||
}
|
||||
debug('render static file %o', file);
|
||||
res.sendFile(file, sendFileCallback(next));
|
||||
});
|
||||
|
||||
// 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: replace existsSync by async alternative
|
||||
if (
|
||||
fs.existsSync(absoluteLocalFile) &&
|
||||
typeof fs.accessSync(absoluteLocalFile, fs.constants.R_OK) === 'undefined'
|
||||
) {
|
||||
// Note: `path.join` will break on Windows, because it transforms `/` to `\`
|
||||
// Use POSIX version `path.posix.join` instead.
|
||||
config.web.logo = path.posix.join('/-/static/', path.basename(config.web.logo));
|
||||
router.get(config.web.logo, function (_req, res, next) {
|
||||
// @ts-ignore
|
||||
debug('serve custom logo web:%s - local:%s', config.web.logo, absoluteLocalFile);
|
||||
res.sendFile(absoluteLocalFile, sendFileCallback(next));
|
||||
});
|
||||
debug('enabled custom logo %s', config.web.logo);
|
||||
} else {
|
||||
config.web.logo = undefined;
|
||||
function renderLogo(logo: string | undefined): string | undefined {
|
||||
// check the origin of the logo
|
||||
if (logo && !isURLhasValidProtocol(logo)) {
|
||||
// URI related to a local file
|
||||
const absoluteLocalFile = path.posix.resolve(logo);
|
||||
debug('serve local logo %s', absoluteLocalFile);
|
||||
try {
|
||||
// TODO: replace existsSync by async alternative
|
||||
if (
|
||||
fs.existsSync(absoluteLocalFile) &&
|
||||
typeof fs.accessSync(absoluteLocalFile, fs.constants.R_OK) === 'undefined'
|
||||
) {
|
||||
// Note: `path.join` will break on Windows, because it transforms `/` to `\`
|
||||
// Use POSIX version `path.posix.join` instead.
|
||||
logo = path.posix.join('/-/static/', path.basename(logo));
|
||||
router.get(logo, function (_req, res, next) {
|
||||
// @ts-ignore
|
||||
debug('serve custom logo web:%s - local:%s', logo, absoluteLocalFile);
|
||||
res.sendFile(absoluteLocalFile, sendFileCallback(next));
|
||||
});
|
||||
debug('enabled custom logo %s', logo);
|
||||
} else {
|
||||
logo = undefined;
|
||||
debug(`web logo is wrong, path ${absoluteLocalFile} does not exist or is not readable`);
|
||||
}
|
||||
} catch {
|
||||
logo = undefined;
|
||||
debug(`web logo is wrong, path ${absoluteLocalFile} does not exist or is not readable`);
|
||||
}
|
||||
} catch {
|
||||
config.web.logo = undefined;
|
||||
debug(`web logo is wrong, path ${absoluteLocalFile} does not exist or is not readable`);
|
||||
}
|
||||
return logo;
|
||||
}
|
||||
|
||||
const logo = renderLogo(config?.web?.logo);
|
||||
if (config?.web?.logo) {
|
||||
config.web.logo = logo;
|
||||
}
|
||||
const logoDark = renderLogo(config?.web?.logoDark);
|
||||
if (config?.web?.logoDark) {
|
||||
config.web.logoDark = logoDark;
|
||||
}
|
||||
|
||||
router.get('/-/web/:section/*', function (req, res) {
|
||||
|
||||
@@ -16,8 +16,16 @@ export function getManifestValue(
|
||||
): string[] {
|
||||
return manifestItems?.map((item) => {
|
||||
debug('resolve item %o', item);
|
||||
const resolvedItem = `${basePath}${manifest[item]}`;
|
||||
const resolvedItem = `${stripTrailingSlash(basePath)}/${stripLeadingSlash(manifest[item])}`;
|
||||
debug('resolved item %o', resolvedItem);
|
||||
return resolvedItem;
|
||||
});
|
||||
}
|
||||
|
||||
function stripTrailingSlash(path: string): string {
|
||||
return path.replace(/\/$/, '');
|
||||
}
|
||||
|
||||
function stripLeadingSlash(path: string): string {
|
||||
return path.replace(/^\//, '');
|
||||
}
|
||||
|
||||
@@ -26,16 +26,20 @@ const defaultManifestFiles: Manifest = {
|
||||
css: [],
|
||||
};
|
||||
|
||||
export function resolveLogo(config: ConfigYaml, requestOptions: RequestOptions) {
|
||||
if (typeof config?.web?.logo !== 'string') {
|
||||
export function resolveLogo(
|
||||
logo: string | undefined,
|
||||
url_prefix: string | undefined,
|
||||
requestOptions: RequestOptions
|
||||
) {
|
||||
if (typeof logo !== 'string') {
|
||||
return '';
|
||||
}
|
||||
const isLocalFile = config?.web?.logo && !isURLhasValidProtocol(config?.web?.logo);
|
||||
const isLocalFile = logo && !isURLhasValidProtocol(logo);
|
||||
|
||||
if (isLocalFile) {
|
||||
return `${getPublicUrl(config?.url_prefix, requestOptions)}-/static/${path.basename(config?.web?.logo)}`;
|
||||
} else if (isURLhasValidProtocol(config?.web?.logo)) {
|
||||
return config?.web?.logo;
|
||||
return `${getPublicUrl(url_prefix, requestOptions)}-/static/${path.basename(logo)}`;
|
||||
} else if (isURLhasValidProtocol(logo)) {
|
||||
return logo;
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
@@ -61,7 +65,9 @@ export default function renderHTML(
|
||||
const title = config?.web?.title ?? WEB_TITLE;
|
||||
const login = hasLogin(config);
|
||||
const scope = config?.web?.scope ?? '';
|
||||
const logo = resolveLogo(config, requestOptions);
|
||||
const favicon = resolveLogo(config?.web?.favicon, config?.url_prefix, requestOptions);
|
||||
const logo = resolveLogo(config?.web?.logo, config?.url_prefix, requestOptions);
|
||||
const logoDark = resolveLogo(config?.web?.logoDark, config?.url_prefix, requestOptions);
|
||||
const pkgManagers = config?.web?.pkgManagers ?? ['yarn', 'pnpm', 'npm'];
|
||||
const version = res.locals.app_version ?? '';
|
||||
const flags = {
|
||||
@@ -81,6 +87,8 @@ export default function renderHTML(
|
||||
showFooter,
|
||||
showSearch,
|
||||
showDownloadTarball,
|
||||
showRaw,
|
||||
showUplinks,
|
||||
} = Object.assign(
|
||||
{},
|
||||
{
|
||||
@@ -97,6 +105,8 @@ export default function renderHTML(
|
||||
showFooter,
|
||||
showSearch,
|
||||
showDownloadTarball,
|
||||
showRaw,
|
||||
showUplinks,
|
||||
darkMode,
|
||||
url_prefix,
|
||||
basename,
|
||||
@@ -104,6 +114,8 @@ export default function renderHTML(
|
||||
primaryColor,
|
||||
version,
|
||||
logo,
|
||||
logoDark,
|
||||
favicon,
|
||||
flags,
|
||||
login,
|
||||
pkgManagers,
|
||||
|
||||
@@ -25,24 +25,24 @@ export default function renderTemplate(template: Template, manifest: WebpackMani
|
||||
|
||||
return `
|
||||
<!DOCTYPE html>
|
||||
<html lang="en-us">
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="${template?.options.base}">
|
||||
<title>${template?.options?.title ?? ''}</title>
|
||||
<title>${template?.options?.title ?? ''}</title>
|
||||
<link rel="icon" href="${template?.options.base}-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<script>
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS=${JSON.stringify(template.options)}
|
||||
</script>
|
||||
${template?.metaScripts ? template.metaScripts.join('') : ''}
|
||||
</head>
|
||||
</head>
|
||||
<body class="body">
|
||||
${template?.scriptsbodyBefore ? template.scriptsbodyBefore.join('') : ''}
|
||||
${template?.scriptsbodyBefore ? template.scriptsbodyBefore.join('') : ''}
|
||||
<div id="root"></div>
|
||||
${getManifestValue(template.manifest.js, manifest, template?.options.base)
|
||||
.map((item) => `<script defer="defer" src="${item}"></script>`)
|
||||
.join('')}
|
||||
.join(`\n `)}
|
||||
${template?.scriptsBodyAfter ? template.scriptsBodyAfter.join('') : ''}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -3,22 +3,23 @@
|
||||
exports[`template custom body after 1`] = `
|
||||
"
|
||||
<!DOCTYPE html>
|
||||
<html lang="en-us">
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="http://domain.com">
|
||||
<title></title>
|
||||
<link rel="icon" href="http://domain.com-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<base href="http://domain.com/">
|
||||
<title></title>
|
||||
<link rel="icon" href="http://domain.com/-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<script>
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com"}
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com/"}
|
||||
</script>
|
||||
|
||||
</head>
|
||||
</head>
|
||||
<body class="body">
|
||||
|
||||
|
||||
<div id="root"></div>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script><script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
<script src="foo"/>
|
||||
</body>
|
||||
</html>
|
||||
@@ -28,22 +29,23 @@ exports[`template custom body after 1`] = `
|
||||
exports[`template custom body before 1`] = `
|
||||
"
|
||||
<!DOCTYPE html>
|
||||
<html lang="en-us">
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="http://domain.com">
|
||||
<title></title>
|
||||
<link rel="icon" href="http://domain.com-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<base href="http://domain.com/">
|
||||
<title></title>
|
||||
<link rel="icon" href="http://domain.com/-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<script>
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com"}
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com/"}
|
||||
</script>
|
||||
|
||||
</head>
|
||||
</head>
|
||||
<body class="body">
|
||||
<script src="fooBefore"/><script src="barBefore"/>
|
||||
<script src="fooBefore"/><script src="barBefore"/>
|
||||
<div id="root"></div>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script><script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -53,22 +55,23 @@ exports[`template custom body before 1`] = `
|
||||
exports[`template custom render 1`] = `
|
||||
"
|
||||
<!DOCTYPE html>
|
||||
<html lang="en-us">
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="http://domain.com">
|
||||
<title></title>
|
||||
<link rel="icon" href="http://domain.com-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<base href="http://domain.com/">
|
||||
<title></title>
|
||||
<link rel="icon" href="http://domain.com/-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<script>
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com"}
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com/"}
|
||||
</script>
|
||||
|
||||
</head>
|
||||
</head>
|
||||
<body class="body">
|
||||
|
||||
|
||||
<div id="root"></div>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script><script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -78,47 +81,23 @@ exports[`template custom render 1`] = `
|
||||
exports[`template custom title 1`] = `
|
||||
"
|
||||
<!DOCTYPE html>
|
||||
<html lang="en-us">
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="http://domain.com">
|
||||
<title>foo title</title>
|
||||
<link rel="icon" href="http://domain.com-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<base href="http://domain.com/">
|
||||
<title>foo title</title>
|
||||
<link rel="icon" href="http://domain.com/-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<script>
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com","title":"foo title"}
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com/","title":"foo title"}
|
||||
</script>
|
||||
|
||||
</head>
|
||||
</head>
|
||||
<body class="body">
|
||||
|
||||
<div id="root"></div>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script><script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
"
|
||||
`;
|
||||
|
||||
exports[`template custom title 2`] = `
|
||||
"
|
||||
<!DOCTYPE html>
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="http://domain.com">
|
||||
<title>foo title</title>
|
||||
<link rel="icon" href="http://domain.com-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<script>
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com","title":"foo title"}
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body class="body">
|
||||
|
||||
<div id="root"></div>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script><script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -128,22 +107,23 @@ exports[`template custom title 2`] = `
|
||||
exports[`template meta scripts 1`] = `
|
||||
"
|
||||
<!DOCTYPE html>
|
||||
<html lang="en-us">
|
||||
<html lang="en-us">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<base href="http://domain.com">
|
||||
<title></title>
|
||||
<link rel="icon" href="http://domain.com-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<base href="http://domain.com/">
|
||||
<title></title>
|
||||
<link rel="icon" href="http://domain.com/-/static/favicon.ico"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<script>
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com"}
|
||||
window.__VERDACCIO_BASENAME_UI_OPTIONS={"base":"http://domain.com/"}
|
||||
</script>
|
||||
<style>.someclass{font-size:10px;}</style>
|
||||
</head>
|
||||
</head>
|
||||
<body class="body">
|
||||
|
||||
|
||||
<div id="root"></div>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script><script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/runtime.6126058572f989c948b1.js"></script>
|
||||
<script defer="defer" src="http://domain.com/-/static/main.6126058572f989c948b1.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
BIN
packages/middleware/test/config/favicon.ico
Normal file
BIN
packages/middleware/test/config/favicon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
@@ -14,6 +14,8 @@ web:
|
||||
showRaw: true
|
||||
primary_color: '#ffffff'
|
||||
logo: './test/config/dark-logo.png'
|
||||
logoDark: './test/config/dark-logo.png'
|
||||
favicon: './test/config/favicon.ico'
|
||||
html_cache: false
|
||||
|
||||
url_prefix: /prefix
|
||||
|
||||
26
packages/middleware/test/config/http-logo.yaml
Normal file
26
packages/middleware/test/config/http-logo.yaml
Normal file
@@ -0,0 +1,26 @@
|
||||
web:
|
||||
title: verdaccio web
|
||||
login: true
|
||||
scope: '@scope'
|
||||
pkgManagers:
|
||||
- pnpm
|
||||
- yarn
|
||||
showInfo: true
|
||||
showSettings: true
|
||||
showSearch: true
|
||||
showFooter: true
|
||||
showThemeSwitch: true
|
||||
showDownloadTarball: true
|
||||
showRaw: true
|
||||
primary_color: '#ffffff'
|
||||
logo: https://raw.githubusercontent.com/verdaccio/verdaccio/master/assets/svg/logo-small.svg
|
||||
logoDark: https://raw.githubusercontent.com/verdaccio/verdaccio/master/assets/svg/logo-blackwhite.svg
|
||||
favicon: https://raw.githubusercontent.com/verdaccio/verdaccio/master/website/static/img/favicon/favicon.ico
|
||||
html_cache: false
|
||||
|
||||
url_prefix: /prefix
|
||||
|
||||
log: { type: stdout, format: pretty, level: trace }
|
||||
|
||||
flags:
|
||||
changePassword: true
|
||||
@@ -14,6 +14,7 @@ web:
|
||||
showRaw: true
|
||||
primary_color: '#ffffff'
|
||||
logo:
|
||||
favicon:
|
||||
html_cache: false
|
||||
|
||||
url_prefix: /prefix
|
||||
|
||||
@@ -8,4 +8,16 @@ describe('manifest', () => {
|
||||
'/-/static/main.6126058572f989c948b1.js',
|
||||
]);
|
||||
});
|
||||
|
||||
test('getManifestValue with base', () => {
|
||||
expect(getManifestValue(['favicon.ico'], manifest, 'http://domain.com')).toEqual([
|
||||
'http://domain.com/-/static/favicon.ico',
|
||||
]);
|
||||
});
|
||||
|
||||
test('getManifestValue with base with trailing slash', () => {
|
||||
expect(getManifestValue(['favicon.ico'], manifest, 'http://domain.com/')).toEqual([
|
||||
'http://domain.com/-/static/favicon.ico',
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -79,6 +79,28 @@ describe('test web server', () => {
|
||||
return loadLogo('file-logo.yaml', '/-/static/dark-logo.png');
|
||||
});
|
||||
|
||||
test('should render dark logo as file', async () => {
|
||||
const {
|
||||
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
|
||||
} = await render('file-logo.yaml');
|
||||
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logoDark).toMatch('/prefix/-/static/dark-logo.png');
|
||||
});
|
||||
|
||||
test('should render favicon as file', async () => {
|
||||
const {
|
||||
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
|
||||
} = await render('file-logo.yaml');
|
||||
expect(__VERDACCIO_BASENAME_UI_OPTIONS.favicon).toMatch('/prefix/-/static/favicon.ico');
|
||||
});
|
||||
|
||||
test('should render logo and favicon as URL', async () => {
|
||||
const {
|
||||
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
|
||||
} = await render('http-logo.yaml');
|
||||
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logo).toMatch(/https:.*logo-small.svg/i);
|
||||
expect(__VERDACCIO_BASENAME_UI_OPTIONS.favicon).toMatch(/https:.*favicon.ico/i);
|
||||
});
|
||||
|
||||
test('should not render logo as absolute file is wrong', async () => {
|
||||
const {
|
||||
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
|
||||
@@ -91,6 +113,7 @@ describe('test web server', () => {
|
||||
window: { __VERDACCIO_BASENAME_UI_OPTIONS },
|
||||
} = await render('no-logo.yaml');
|
||||
expect(__VERDACCIO_BASENAME_UI_OPTIONS.logo).toEqual('');
|
||||
expect(__VERDACCIO_BASENAME_UI_OPTIONS.favicon).toEqual('');
|
||||
});
|
||||
|
||||
test.todo('should default title');
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user