diff --git a/.all-contributorsrc b/.all-contributorsrc deleted file mode 100644 index 2e9a23658..000000000 --- a/.all-contributorsrc +++ /dev/null @@ -1,245 +0,0 @@ -{ - "projectName": "verdaccio", - "projectOwner": "verdaccio", - "repoType": "github", - "repoHost": "https://github.com", - "commitConvention": "none", - "files": [ - "CONTRIBUTORS.md" - ], - "contributors": [ - { - "login": "juanpicado", - "name": "Juan Picado", - "avatar_url": "https://avatars0.githubusercontent.com/u/558752?v=4", - "profile": "https://www.linkedin.com/in/jotadeveloper/", - "contributions": [ - "doc", - "code", - "infra", - "eventOrganizing", - "blog", - "maintenance" - ] - }, - { - "login": "sergiohgz", - "name": "Sergio Herrera", - "avatar_url": "https://avatars3.githubusercontent.com/u/14012309?v=4", - "profile": "https://github.com/sergiohgz", - "contributions": [ - "infra", - "maintenance" - ] - }, - { - "login": "DanielRuf", - "name": "Daniel Ruf", - "avatar_url": "https://avatars1.githubusercontent.com/u/827205?v=4", - "profile": "https://daniel-ruf.de/", - "contributions": [ - "security", - "infra", - "maintenance" - ] - }, - { - "login": "priscilawebdev", - "name": "Priscila Oliveira", - "avatar_url": "https://avatars1.githubusercontent.com/u/29228205?v=4", - "profile": "https://priscilawebdev.github.io/priscilaoliveira/", - "contributions": [ - "design", - "code", - "maintenance" - ] - }, - { - "login": "ayusharma", - "name": "Ayush Sharma", - "avatar_url": "https://avatars0.githubusercontent.com/u/6918450?v=4", - "profile": "http://ayusharma.github.io/", - "contributions": [ - "infra", - "code", - "design" - ] - }, - { - "login": "trentearl", - "name": "Trent Earl", - "avatar_url": "https://avatars2.githubusercontent.com/u/802857?v=4", - "profile": "https://github.com/trentearl", - "contributions": [ - "code" - ] - }, - { - "login": "jmwilkinson", - "name": "jmwilkinson", - "avatar_url": "https://avatars0.githubusercontent.com/u/17836030?v=4", - "profile": "https://github.com/jmwilkinson", - "contributions": [ - "code" - ] - }, - { - "login": "bufferoverflow", - "name": "Roger Meier", - "avatar_url": "https://avatars2.githubusercontent.com/u/378909?v=4", - "profile": "https://github.com/bufferoverflow", - "contributions": [ - "plugin" - ] - }, - { - "login": "jamesgeorge007", - "name": "James George", - "avatar_url": "https://avatars2.githubusercontent.com/u/25279263?v=4", - "profile": "https://ghuser.io/jamesgeorge007", - "contributions": [ - "code" - ] - }, - { - "login": "AvailCat", - "name": "AvailCat", - "avatar_url": "https://avatars3.githubusercontent.com/u/19658647?v=4", - "profile": "https://github.com/AvailCat", - "contributions": [ - "code", - "infra", - "maintenance" - ] - }, - { - "login": "lgaitan", - "name": "Lucius Gaitán", - "avatar_url": "https://avatars0.githubusercontent.com/u/5970350?v=4", - "profile": "https://www.luciusgaitan.com/", - "contributions": [ - "code" - ] - }, - { - "login": "ramonornela", - "name": "Ramon Henrique Ornelas", - "avatar_url": "https://avatars1.githubusercontent.com/u/187946?v=4", - "profile": "https://github.com/ramonornela", - "contributions": [ - "code" - ] - }, - { - "login": "UnitedMarsupials-zz", - "name": "UnitedMarsupials-zz", - "avatar_url": "https://avatars1.githubusercontent.com/u/1486340?v=4", - "profile": "https://people.freebsd.org/~mi/resume/", - "contributions": [ - "code" - ] - }, - { - "login": "ryan-codingintrigue", - "name": "Ryan Graham", - "avatar_url": "https://avatars0.githubusercontent.com/u/9048902?v=4", - "profile": "http://www.codingintrigue.co.uk/", - "contributions": [ - "code" - ] - }, - { - "login": "coolsp", - "name": "coolsp", - "avatar_url": "https://avatars1.githubusercontent.com/u/1246647?v=4", - "profile": "https://github.com/coolsp", - "contributions": [ - "code" - ] - }, - { - "login": "ashishsurana", - "name": "Ashish Surana", - "avatar_url": "https://avatars0.githubusercontent.com/u/5610944?v=4", - "profile": "http://ashishsurana.in/", - "contributions": [ - "code" - ] - }, - { - "login": "buffaybu", - "name": "Wang Yifei", - "avatar_url": "https://avatars3.githubusercontent.com/u/2025661?v=4", - "profile": "https://github.com/buffaybu", - "contributions": [ - "code" - ] - }, - { - "login": "lirantal", - "name": "Liran Tal", - "avatar_url": "https://avatars1.githubusercontent.com/u/316371?v=4", - "profile": "https://twitter.com/liran_tal", - "contributions": [ - "code" - ] - }, - { - "login": "brenordr", - "name": "Breno Rodrigues", - "avatar_url": "https://avatars2.githubusercontent.com/u/19731692?v=4", - "profile": "https://github.com/brenordr", - "contributions": [ - "code" - ] - }, - { - "login": "jachstet-sea", - "name": "jachstet-sea", - "avatar_url": "https://avatars0.githubusercontent.com/u/7993508?v=4", - "profile": "https://github.com/jachstet-sea", - "contributions": [ - "code" - ] - }, - { - "login": "Vrtak-CZ", - "name": "Patrik Votoček", - "avatar_url": "https://avatars1.githubusercontent.com/u/112567?v=4", - "profile": "https://patrik.votocek.cz/", - "contributions": [ - "code" - ] - }, - { - "login": "monkeywithacupcake", - "name": "jess", - "avatar_url": "https://avatars3.githubusercontent.com/u/7316730?v=4", - "profile": "https://github.com/monkeywithacupcake", - "contributions": [ - "code" - ] - }, - { - "login": "toolsofraj", - "name": "toolsofraj", - "avatar_url": "https://avatars0.githubusercontent.com/u/2507152?v=4", - "profile": "https://github.com/toolsofraj", - "contributions": [ - "code" - ] - }, - { - "login": "ddhp", - "name": "Jian-Chen Chen (jesse)", - "avatar_url": "https://avatars1.githubusercontent.com/u/1715380?v=4", - "profile": "https://github.com/ddhp", - "contributions": [ - "translation", - "code" - ] - } - ], - "skipCi": true, - "contributorsPerLine": 7 -} diff --git a/.pnp.cjs b/.pnp.cjs index 196b3de6f..60ba38814 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -82,7 +82,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@verdaccio/types", "npm:10.7.0"],\ ["@verdaccio/ui-theme", "npm:6.0.0-6-next.51"],\ ["JSONStream", "npm:1.3.5"],\ - ["all-contributors-cli", "npm:6.20.0"],\ ["async", "npm:3.2.4"],\ ["babel-eslint", "virtual:7f7b3df50ee4b7b1719ad19fad11505dc2788f3227a7e5cc9ca19f71d8cb309c9d33b532ea2b2b60ab65abf6cc12153df4643c5e6e17d01ea0ae0492723bb4b4#npm:10.1.0"],\ ["babel-jest", "virtual:7f7b3df50ee4b7b1719ad19fad11505dc2788f3227a7e5cc9ca19f71d8cb309c9d33b532ea2b2b60ab65abf6cc12153df4643c5e6e17d01ea0ae0492723bb4b4#npm:26.6.3"],\ @@ -5053,25 +5052,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["all-contributors-cli", [\ - ["npm:6.20.0", {\ - "packageLocation": "./.yarn/cache/all-contributors-cli-npm-6.20.0-ba332c4a3e-3ac54cc73b.zip/node_modules/all-contributors-cli/",\ - "packageDependencies": [\ - ["all-contributors-cli", "npm:6.20.0"],\ - ["@babel/runtime", "npm:7.20.1"],\ - ["async", "npm:3.2.4"],\ - ["chalk", "npm:4.1.2"],\ - ["didyoumean", "npm:1.2.2"],\ - ["inquirer", "npm:7.3.3"],\ - ["json-fixer", "npm:1.6.15"],\ - ["lodash", "npm:4.17.21"],\ - ["node-fetch", "virtual:25a5f5382d53dbf298bf7a1191760bc2e0a523a619eeb0e667b99a8649e8ad183f9e2e0b45f6fb831b92f4078b61622aa567cf79565f6aa5af9597e3c84864f6#npm:2.6.7"],\ - ["pify", "npm:5.0.0"],\ - ["yargs", "npm:15.4.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["ansi-colors", [\ ["npm:4.1.3", {\ "packageLocation": "./.yarn/cache/ansi-colors-npm-4.1.3-8ffd0ae6c7-a9c2ec8420.zip/node_modules/ansi-colors/",\ @@ -6088,15 +6068,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["chardet", [\ - ["npm:0.7.0", {\ - "packageLocation": "./.yarn/cache/chardet-npm-0.7.0-27933dd6c7-6fd5da1f5d.zip/node_modules/chardet/",\ - "packageDependencies": [\ - ["chardet", "npm:0.7.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["chokidar", [\ ["npm:3.5.3", {\ "packageLocation": "./.yarn/cache/chokidar-npm-3.5.3-c5f9b0a56a-b49fcde401.zip/node_modules/chokidar/",\ @@ -6184,15 +6155,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["cli-width", [\ - ["npm:3.0.0", {\ - "packageLocation": "./.yarn/cache/cli-width-npm-3.0.0-387b3f68f9-4c94af3769.zip/node_modules/cli-width/",\ - "packageDependencies": [\ - ["cli-width", "npm:3.0.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["clipanion", [\ ["npm:3.1.0", {\ "packageLocation": "./.yarn/cache/clipanion-npm-3.1.0-ced87dbbea-bf350082e8.zip/node_modules/clipanion/",\ @@ -7218,15 +7180,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["didyoumean", [\ - ["npm:1.2.2", {\ - "packageLocation": "./.yarn/cache/didyoumean-npm-1.2.2-fd568ec571-d5d98719d5.zip/node_modules/didyoumean/",\ - "packageDependencies": [\ - ["didyoumean", "npm:1.2.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["diff", [\ ["npm:4.0.2", {\ "packageLocation": "./.yarn/cache/diff-npm-4.0.2-73133c7102-f2c09b0ce4.zip/node_modules/diff/",\ @@ -8298,18 +8251,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["external-editor", [\ - ["npm:3.1.0", {\ - "packageLocation": "./.yarn/cache/external-editor-npm-3.1.0-878e7807af-1c2a616a73.zip/node_modules/external-editor/",\ - "packageDependencies": [\ - ["external-editor", "npm:3.1.0"],\ - ["chardet", "npm:0.7.0"],\ - ["iconv-lite", "npm:0.4.24"],\ - ["tmp", "npm:0.0.33"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["extglob", [\ ["npm:2.0.4", {\ "packageLocation": "./.yarn/cache/extglob-npm-2.0.4-0f39bc9899-a41531b893.zip/node_modules/extglob/",\ @@ -9499,28 +9440,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["inquirer", [\ - ["npm:7.3.3", {\ - "packageLocation": "./.yarn/cache/inquirer-npm-7.3.3-9e86782610-4d387fc1eb.zip/node_modules/inquirer/",\ - "packageDependencies": [\ - ["inquirer", "npm:7.3.3"],\ - ["ansi-escapes", "npm:4.3.2"],\ - ["chalk", "npm:4.1.2"],\ - ["cli-cursor", "npm:3.1.0"],\ - ["cli-width", "npm:3.0.0"],\ - ["external-editor", "npm:3.1.0"],\ - ["figures", "npm:3.2.0"],\ - ["lodash", "npm:4.17.21"],\ - ["mute-stream", "npm:0.0.8"],\ - ["run-async", "npm:2.4.1"],\ - ["rxjs", "npm:6.6.7"],\ - ["string-width", "npm:4.2.3"],\ - ["strip-ansi", "npm:6.0.1"],\ - ["through", "npm:2.3.8"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["internal-slot", [\ ["npm:1.0.3", {\ "packageLocation": "./.yarn/cache/internal-slot-npm-1.0.3-9e05eea002-1944f92e98.zip/node_modules/internal-slot/",\ @@ -10741,18 +10660,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["json-fixer", [\ - ["npm:1.6.15", {\ - "packageLocation": "./.yarn/cache/json-fixer-npm-1.6.15-ae75b6da33-ae805d5155.zip/node_modules/json-fixer/",\ - "packageDependencies": [\ - ["json-fixer", "npm:1.6.15"],\ - ["@babel/runtime", "npm:7.20.1"],\ - ["chalk", "npm:4.1.2"],\ - ["pegjs", "npm:0.10.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["json-parse-better-errors", [\ ["npm:1.0.2", {\ "packageLocation": "./.yarn/cache/json-parse-better-errors-npm-1.0.2-7f37637d19-ff2b5ba2a7.zip/node_modules/json-parse-better-errors/",\ @@ -11841,15 +11748,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["mute-stream", [\ - ["npm:0.0.8", {\ - "packageLocation": "./.yarn/cache/mute-stream-npm-0.0.8-489a7d6c2b-ff48d251fc.zip/node_modules/mute-stream/",\ - "packageDependencies": [\ - ["mute-stream", "npm:0.0.8"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["mv", [\ ["npm:2.1.1", {\ "packageLocation": "./.yarn/cache/mv-npm-2.1.1-4c2aca3831-59d4b5ebff.zip/node_modules/mv/",\ @@ -12336,15 +12234,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["os-tmpdir", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/cache/os-tmpdir-npm-1.0.2-e305b0689b-5666560f7b.zip/node_modules/os-tmpdir/",\ - "packageDependencies": [\ - ["os-tmpdir", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["p-each-series", [\ ["npm:2.2.0", {\ "packageLocation": "./.yarn/cache/p-each-series-npm-2.2.0-b9907a1ae6-5fbe2f1f19.zip/node_modules/p-each-series/",\ @@ -12602,15 +12491,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["pegjs", [\ - ["npm:0.10.0", {\ - "packageLocation": "./.yarn/cache/pegjs-npm-0.10.0-a48104cf8e-65d184ca0e.zip/node_modules/pegjs/",\ - "packageDependencies": [\ - ["pegjs", "npm:0.10.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["performance-now", [\ ["npm:2.1.0", {\ "packageLocation": "./.yarn/cache/performance-now-npm-2.1.0-45e3ce7e49-534e641aa8.zip/node_modules/performance-now/",\ @@ -12659,13 +12539,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["pify", "npm:4.0.1"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:5.0.0", {\ - "packageLocation": "./.yarn/cache/pify-npm-5.0.0-f5abe8ab8d-443e3e198a.zip/node_modules/pify/",\ - "packageDependencies": [\ - ["pify", "npm:5.0.0"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["pino", [\ @@ -13479,15 +13352,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["run-async", [\ - ["npm:2.4.1", {\ - "packageLocation": "./.yarn/cache/run-async-npm-2.4.1-a94bb90861-a2c88aa15d.zip/node_modules/run-async/",\ - "packageDependencies": [\ - ["run-async", "npm:2.4.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["run-parallel", [\ ["npm:1.2.0", {\ "packageLocation": "./.yarn/cache/run-parallel-npm-1.2.0-3f47ff2034-cb4f97ad25.zip/node_modules/run-parallel/",\ @@ -13499,14 +13363,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["rxjs", [\ - ["npm:6.6.7", {\ - "packageLocation": "./.yarn/cache/rxjs-npm-6.6.7-055046ea3c-bc334edef1.zip/node_modules/rxjs/",\ - "packageDependencies": [\ - ["rxjs", "npm:6.6.7"],\ - ["tslib", "npm:1.14.1"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:7.5.7", {\ "packageLocation": "./.yarn/cache/rxjs-npm-7.5.7-602d5c56e4-edabcdb73b.zip/node_modules/rxjs/",\ "packageDependencies": [\ @@ -14515,16 +14371,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["tmp", [\ - ["npm:0.0.33", {\ - "packageLocation": "./.yarn/cache/tmp-npm-0.0.33-bcbf65df2a-902d7aceb7.zip/node_modules/tmp/",\ - "packageDependencies": [\ - ["tmp", "npm:0.0.33"],\ - ["os-tmpdir", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["tmpl", [\ ["npm:1.0.5", {\ "packageLocation": "./.yarn/cache/tmpl-npm-1.0.5-d399ba37e2-cd922d9b85.zip/node_modules/tmpl/",\ @@ -15276,7 +15122,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@verdaccio/types", "npm:10.7.0"],\ ["@verdaccio/ui-theme", "npm:6.0.0-6-next.51"],\ ["JSONStream", "npm:1.3.5"],\ - ["all-contributors-cli", "npm:6.20.0"],\ ["async", "npm:3.2.4"],\ ["babel-eslint", "virtual:7f7b3df50ee4b7b1719ad19fad11505dc2788f3227a7e5cc9ca19f71d8cb309c9d33b532ea2b2b60ab65abf6cc12153df4643c5e6e17d01ea0ae0492723bb4b4#npm:10.1.0"],\ ["babel-jest", "virtual:7f7b3df50ee4b7b1719ad19fad11505dc2788f3227a7e5cc9ca19f71d8cb309c9d33b532ea2b2b60ab65abf6cc12153df4643c5e6e17d01ea0ae0492723bb4b4#npm:26.6.3"],\ diff --git a/.vscode/settings.json b/.vscode/settings.json index 7e2a0a626..78578c773 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,8 +12,6 @@ ], "files.exclude": { "**/.idea": false, - "**/.nyc_output": true, - "**/build": true, "**/coverage": true }, "editor.formatOnSave": true, diff --git a/.yarn/cache/all-contributors-cli-npm-6.20.0-ba332c4a3e-3ac54cc73b.zip b/.yarn/cache/all-contributors-cli-npm-6.20.0-ba332c4a3e-3ac54cc73b.zip deleted file mode 100644 index b49a2a9b7..000000000 Binary files a/.yarn/cache/all-contributors-cli-npm-6.20.0-ba332c4a3e-3ac54cc73b.zip and /dev/null differ diff --git a/.yarn/cache/chardet-npm-0.7.0-27933dd6c7-6fd5da1f5d.zip b/.yarn/cache/chardet-npm-0.7.0-27933dd6c7-6fd5da1f5d.zip deleted file mode 100644 index 0316560c6..000000000 Binary files a/.yarn/cache/chardet-npm-0.7.0-27933dd6c7-6fd5da1f5d.zip and /dev/null differ diff --git a/.yarn/cache/cli-width-npm-3.0.0-387b3f68f9-4c94af3769.zip b/.yarn/cache/cli-width-npm-3.0.0-387b3f68f9-4c94af3769.zip deleted file mode 100644 index b652c4f73..000000000 Binary files a/.yarn/cache/cli-width-npm-3.0.0-387b3f68f9-4c94af3769.zip and /dev/null differ diff --git a/.yarn/cache/didyoumean-npm-1.2.2-fd568ec571-d5d98719d5.zip b/.yarn/cache/didyoumean-npm-1.2.2-fd568ec571-d5d98719d5.zip deleted file mode 100644 index c4ed417d0..000000000 Binary files a/.yarn/cache/didyoumean-npm-1.2.2-fd568ec571-d5d98719d5.zip and /dev/null differ diff --git a/.yarn/cache/external-editor-npm-3.1.0-878e7807af-1c2a616a73.zip b/.yarn/cache/external-editor-npm-3.1.0-878e7807af-1c2a616a73.zip deleted file mode 100644 index 6375d6aad..000000000 Binary files a/.yarn/cache/external-editor-npm-3.1.0-878e7807af-1c2a616a73.zip and /dev/null differ diff --git a/.yarn/cache/inquirer-npm-7.3.3-9e86782610-4d387fc1eb.zip b/.yarn/cache/inquirer-npm-7.3.3-9e86782610-4d387fc1eb.zip deleted file mode 100644 index 9e14affd9..000000000 Binary files a/.yarn/cache/inquirer-npm-7.3.3-9e86782610-4d387fc1eb.zip and /dev/null differ diff --git a/.yarn/cache/json-fixer-npm-1.6.15-ae75b6da33-ae805d5155.zip b/.yarn/cache/json-fixer-npm-1.6.15-ae75b6da33-ae805d5155.zip deleted file mode 100644 index 2a65a569d..000000000 Binary files a/.yarn/cache/json-fixer-npm-1.6.15-ae75b6da33-ae805d5155.zip and /dev/null differ diff --git a/.yarn/cache/mute-stream-npm-0.0.8-489a7d6c2b-ff48d251fc.zip b/.yarn/cache/mute-stream-npm-0.0.8-489a7d6c2b-ff48d251fc.zip deleted file mode 100644 index 33156aeab..000000000 Binary files a/.yarn/cache/mute-stream-npm-0.0.8-489a7d6c2b-ff48d251fc.zip and /dev/null differ diff --git a/.yarn/cache/os-tmpdir-npm-1.0.2-e305b0689b-5666560f7b.zip b/.yarn/cache/os-tmpdir-npm-1.0.2-e305b0689b-5666560f7b.zip deleted file mode 100644 index d68d71063..000000000 Binary files a/.yarn/cache/os-tmpdir-npm-1.0.2-e305b0689b-5666560f7b.zip and /dev/null differ diff --git a/.yarn/cache/pegjs-npm-0.10.0-a48104cf8e-65d184ca0e.zip b/.yarn/cache/pegjs-npm-0.10.0-a48104cf8e-65d184ca0e.zip deleted file mode 100644 index 5a3e77146..000000000 Binary files a/.yarn/cache/pegjs-npm-0.10.0-a48104cf8e-65d184ca0e.zip and /dev/null differ diff --git a/.yarn/cache/pify-npm-5.0.0-f5abe8ab8d-443e3e198a.zip b/.yarn/cache/pify-npm-5.0.0-f5abe8ab8d-443e3e198a.zip deleted file mode 100644 index dabc1ec95..000000000 Binary files a/.yarn/cache/pify-npm-5.0.0-f5abe8ab8d-443e3e198a.zip and /dev/null differ diff --git a/.yarn/cache/run-async-npm-2.4.1-a94bb90861-a2c88aa15d.zip b/.yarn/cache/run-async-npm-2.4.1-a94bb90861-a2c88aa15d.zip deleted file mode 100644 index 34c485e0b..000000000 Binary files a/.yarn/cache/run-async-npm-2.4.1-a94bb90861-a2c88aa15d.zip and /dev/null differ diff --git a/.yarn/cache/rxjs-npm-6.6.7-055046ea3c-bc334edef1.zip b/.yarn/cache/rxjs-npm-6.6.7-055046ea3c-bc334edef1.zip deleted file mode 100644 index ba92cebbd..000000000 Binary files a/.yarn/cache/rxjs-npm-6.6.7-055046ea3c-bc334edef1.zip and /dev/null differ diff --git a/.yarn/cache/tmp-npm-0.0.33-bcbf65df2a-902d7aceb7.zip b/.yarn/cache/tmp-npm-0.0.33-bcbf65df2a-902d7aceb7.zip deleted file mode 100644 index fa335bbc0..000000000 Binary files a/.yarn/cache/tmp-npm-0.0.33-bcbf65df2a-902d7aceb7.zip and /dev/null differ diff --git a/package.json b/package.json index ec88880db..b9e3e3476 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ }, "homepage": "https://verdaccio.org", "main": "build/index.js", + "types": "build/index.d.ts", "bin": "./bin/verdaccio", "funding": { "type": "opencollective", @@ -105,7 +106,6 @@ "@typescript-eslint/parser": "5.22.0", "@verdaccio-scope/verdaccio-auth-foo": "0.0.2", "@verdaccio/types": "10.7.0", - "all-contributors-cli": "6.20.0", "babel-eslint": "10.1.0", "babel-jest": "26.6.3", "babel-plugin-dynamic-import-node": "2.3.3", @@ -174,6 +174,7 @@ "start:debug": "yarn node debug/bootstrap.js", "start:run-server": "yarn node debug/bootstrap-runserver.js", "code:build": "yarn babel src/ --out-dir build/ --copy-files --extensions \".ts,.tsx\" --source-maps inline", + "code:types": "tsc --emitDeclarationOnly -p tsconfig.json", "code:docker-build": "yarn babel src/ --out-dir build/ --copy-files --extensions \".ts,.tsx\"", "docker": "docker build -t verdaccio/verdaccio:local . --no-cache", "docker:run": "docker run -it --rm -p 4873:4873 verdaccio/verdaccio:local" @@ -194,7 +195,8 @@ "*.{js,ts,tsx}": "eslint --fix -c ./eslintrc.js" }, "resolutions": { - "@types/serve-static": "1.13.10" + "@types/serve-static": "1.13.10", + "yarn3_test": "portal:/Users/jpicado/projects/sandbox/yarn3_test" }, "collective": { "type": "opencollective", diff --git a/src/api/debug/index.ts b/src/api/debug/index.ts index a39317b82..13237d744 100644 --- a/src/api/debug/index.ts +++ b/src/api/debug/index.ts @@ -1,7 +1,7 @@ import { Application } from 'express'; import _ from 'lodash'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../../../types'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../../types'; export default (app: Application, selfPath: string): void => { // Hook for tests only diff --git a/src/api/endpoint/api/dist-tags.ts b/src/api/endpoint/api/dist-tags.ts index 4fbc841e7..3858c2e2e 100644 --- a/src/api/endpoint/api/dist-tags.ts +++ b/src/api/endpoint/api/dist-tags.ts @@ -5,8 +5,8 @@ import mime from 'mime'; import { VerdaccioError } from '@verdaccio/commons-api'; import { Package } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../../../types'; import { API_MESSAGE, DIST_TAGS, HTTP_STATUS } from '../../../lib/constants'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../../types'; import { allow, media } from '../../middleware'; export default function (route: Router, auth: IAuth, storage: IStorageHandler): void { diff --git a/src/api/endpoint/api/package.ts b/src/api/endpoint/api/package.ts index 52741ce6e..ea9cd9a55 100644 --- a/src/api/endpoint/api/package.ts +++ b/src/api/endpoint/api/package.ts @@ -3,9 +3,9 @@ import _ from 'lodash'; import { Config, Package } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../../../types'; import { API_ERROR, DIST_TAGS, HEADERS } from '../../../lib/constants'; import { ErrorCode, convertDistRemoteToLocalTarballUrls, getVersion } from '../../../lib/utils'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../../types'; import { getByQualityPriorityValue } from '../../../utils/string'; import { allow } from '../../middleware'; diff --git a/src/api/endpoint/api/ping.ts b/src/api/endpoint/api/ping.ts index bbd822717..63ba7e44c 100644 --- a/src/api/endpoint/api/ping.ts +++ b/src/api/endpoint/api/ping.ts @@ -1,6 +1,6 @@ import { Router } from 'express'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../../../../types'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../../../types'; export default function (route: Router): void { route.get('/-/ping', function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) { diff --git a/src/api/endpoint/api/publish.ts b/src/api/endpoint/api/publish.ts index 3c96c4cc1..c45e5cbc8 100644 --- a/src/api/endpoint/api/publish.ts +++ b/src/api/endpoint/api/publish.ts @@ -6,12 +6,12 @@ import Path from 'path'; import { Callback, Config, MergeTags, Package, Version } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../../../types'; import { API_ERROR, API_MESSAGE, DIST_TAGS, HEADERS, HTTP_STATUS } from '../../../lib/constants'; import { logger } from '../../../lib/logger'; import { notify } from '../../../lib/notify'; import { isPublishablePackage } from '../../../lib/storage-utils'; import { ErrorCode, hasDiffOneKey, isObject, isRelatedToDeprecation, validateMetadata } from '../../../lib/utils'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../../types'; import { allow, expectJson, media } from '../../middleware'; import star from './star'; diff --git a/src/api/endpoint/api/star.ts b/src/api/endpoint/api/star.ts index fe0cd07c1..1f6342e0d 100644 --- a/src/api/endpoint/api/star.ts +++ b/src/api/endpoint/api/star.ts @@ -3,9 +3,9 @@ import buildDebug from 'debug'; import { Response } from 'express'; import _ from 'lodash'; -import { $NextFunctionVer, $RequestExtend, IStorageHandler } from '../../../../types'; import { HTTP_STATUS, USERS } from '../../../lib/constants'; import { logger } from '../../../lib/logger'; +import { $NextFunctionVer, $RequestExtend, IStorageHandler } from '../../../types'; const debug = buildDebug('verdaccio:star'); export default function (storage: IStorageHandler): (req: $RequestExtend, res: Response, next: $NextFunctionVer) => void { diff --git a/src/api/endpoint/api/stars.ts b/src/api/endpoint/api/stars.ts index c9b00fcf8..1df70e39f 100644 --- a/src/api/endpoint/api/stars.ts +++ b/src/api/endpoint/api/stars.ts @@ -3,8 +3,8 @@ import _ from 'lodash'; import { Package } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, IStorageHandler } from '../../../../types'; import { HTTP_STATUS, USERS } from '../../../lib/constants'; +import { $NextFunctionVer, $RequestExtend, IStorageHandler } from '../../../types'; type Packages = Package[]; diff --git a/src/api/endpoint/api/user.ts b/src/api/endpoint/api/user.ts index 33c2d82a7..98afeaf1d 100644 --- a/src/api/endpoint/api/user.ts +++ b/src/api/endpoint/api/user.ts @@ -4,11 +4,11 @@ import _ from 'lodash'; import { Config, RemoteUser } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth } from '../../../../types'; import { createRemoteUser, createSessionToken, getApiToken, getAuthenticatedMessage, validatePassword } from '../../../lib/auth-utils'; import { API_ERROR, API_MESSAGE, HEADERS, HTTP_STATUS } from '../../../lib/constants'; import { logger } from '../../../lib/logger'; import { ErrorCode } from '../../../lib/utils'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth } from '../../../types'; import { limiter } from '../../rate-limiter'; export default function (route: Router, auth: IAuth, config: Config): void { diff --git a/src/api/endpoint/api/v1/profile.ts b/src/api/endpoint/api/v1/profile.ts index 25fe10b49..55f2829c2 100644 --- a/src/api/endpoint/api/v1/profile.ts +++ b/src/api/endpoint/api/v1/profile.ts @@ -1,10 +1,10 @@ import { Response, Router } from 'express'; import _ from 'lodash'; -import { $NextFunctionVer, $RequestExtend, IAuth } from '../../../../../types'; import { validatePassword } from '../../../../lib/auth-utils'; import { API_ERROR, APP_ERROR, HTTP_STATUS, SUPPORT_ERRORS } from '../../../../lib/constants'; import { ErrorCode } from '../../../../lib/utils'; +import { $NextFunctionVer, $RequestExtend, IAuth } from '../../../../types'; import { limiter } from '../../../rate-limiter'; export interface Profile { diff --git a/src/api/endpoint/api/v1/token.ts b/src/api/endpoint/api/v1/token.ts index 8d4217028..42766300c 100644 --- a/src/api/endpoint/api/v1/token.ts +++ b/src/api/endpoint/api/v1/token.ts @@ -4,12 +4,12 @@ import _ from 'lodash'; import { Config, RemoteUser, Token } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, IAuth, IStorageHandler } from '../../../../../types'; import { getApiToken } from '../../../../lib/auth-utils'; import { HEADERS, HTTP_STATUS, SUPPORT_ERRORS } from '../../../../lib/constants'; import { stringToMD5 } from '../../../../lib/crypto-utils'; import { logger } from '../../../../lib/logger'; import { ErrorCode, mask } from '../../../../lib/utils'; +import { $NextFunctionVer, $RequestExtend, IAuth, IStorageHandler } from '../../../../types'; import { limiter } from '../../../rate-limiter'; const debug = buildDebug('verdaccio:token'); diff --git a/src/api/endpoint/api/whoami.ts b/src/api/endpoint/api/whoami.ts index 89345c32f..3b4a000e4 100644 --- a/src/api/endpoint/api/whoami.ts +++ b/src/api/endpoint/api/whoami.ts @@ -1,6 +1,6 @@ import { Response, Router } from 'express'; -import { $NextFunctionVer, $RequestExtend } from '../../../../types'; +import { $NextFunctionVer, $RequestExtend } from '../../../types'; export default function (route: Router): void { route.get('/whoami', (req: $RequestExtend, res: Response, next: $NextFunctionVer): void => { diff --git a/src/api/endpoint/index.ts b/src/api/endpoint/index.ts index 2ebda3031..550b1f2c9 100644 --- a/src/api/endpoint/index.ts +++ b/src/api/endpoint/index.ts @@ -4,7 +4,7 @@ import _ from 'lodash'; import { Config } from '@verdaccio/types'; -import { IAuth, IStorageHandler } from '../../../types'; +import { IAuth, IStorageHandler } from '../../types'; import distTags from './api/dist-tags'; import pkg from './api/package'; import ping from './api/ping'; diff --git a/src/api/index.ts b/src/api/index.ts index e59dabd19..4c8ab6d4d 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -6,7 +6,6 @@ import _ from 'lodash'; import { Config as IConfig, IPluginMiddleware, IPluginStorageFilter } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../types'; import Auth from '../lib/auth'; import AppConfig from '../lib/config'; import { API_ERROR, HTTP_STATUS } from '../lib/constants'; @@ -14,6 +13,7 @@ import { logger, setup } from '../lib/logger'; import loadPlugin from '../lib/plugin-loader'; import Storage from '../lib/storage'; import { ErrorCode, getUserAgent } from '../lib/utils'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../types'; import hookDebug from './debug'; import apiEndpoint from './endpoint'; import { errorReportingMiddleware, final, log, serveFavicon } from './middleware'; diff --git a/src/api/middleware.ts b/src/api/middleware.ts index fd6e568cf..a1462be98 100644 --- a/src/api/middleware.ts +++ b/src/api/middleware.ts @@ -7,11 +7,11 @@ import validator from 'validator'; import { VerdaccioError } from '@verdaccio/commons-api'; import { Config, Package, RemoteUser } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth } from '../../types'; import { API_ERROR, HEADERS, HEADER_TYPE, HTTP_STATUS, TOKEN_BASIC, TOKEN_BEARER } from '../lib/constants'; import { stringToMD5 } from '../lib/crypto-utils'; import { logger } from '../lib/logger'; import { ErrorCode, getVersionFromTarball, isObject, validateName as utilValidateName, validatePackage as utilValidatePackage } from '../lib/utils'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth } from '../types'; const debug = buildDebug('verdaccio'); diff --git a/src/api/web/api.ts b/src/api/web/api.ts index 86c0cb960..92815a872 100644 --- a/src/api/web/api.ts +++ b/src/api/web/api.ts @@ -3,8 +3,8 @@ import { Router } from 'express'; import { Config } from '@verdaccio/types'; -import { IAuth, IStorageHandler } from '../../../types'; import Search from '../../lib/search'; +import { IAuth, IStorageHandler } from '../../types'; import { match, setSecurityWebHeaders, validateName, validatePackage } from '../middleware'; import webApi from './endpoint'; diff --git a/src/api/web/endpoint/package.ts b/src/api/web/endpoint/package.ts index 63a533433..c001b7451 100644 --- a/src/api/web/endpoint/package.ts +++ b/src/api/web/endpoint/package.ts @@ -3,7 +3,6 @@ import _ from 'lodash'; import { Config, Package } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend, $SidebarPackage, IAuth, IStorageHandler } from '../../../../types'; import { DIST_TAGS, HEADERS, HEADER_TYPE, HTTP_STATUS } from '../../../lib/constants'; import { logger } from '../../../lib/logger'; import { @@ -18,6 +17,7 @@ import { parseReadme, sortByName, } from '../../../lib/utils'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend, $SidebarPackage, IAuth, IStorageHandler } from '../../../types'; import { generateGravatarUrl } from '../../../utils/user'; import { allow } from '../../middleware'; diff --git a/src/api/web/endpoint/search.ts b/src/api/web/endpoint/search.ts index 964444bb6..a09d14dbd 100644 --- a/src/api/web/endpoint/search.ts +++ b/src/api/web/endpoint/search.ts @@ -2,9 +2,9 @@ import { Router } from 'express'; import { Package } from '@verdaccio/types'; -import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../../../types'; import { DIST_TAGS } from '../../../lib/constants'; import Search from '../../../lib/search'; +import { $NextFunctionVer, $RequestExtend, $ResponseExtend, IAuth, IStorageHandler } from '../../../types'; function addSearchWebApi(storage: IStorageHandler, auth: IAuth): Router { const route = Router(); /* eslint new-cap: 0 */ diff --git a/src/api/web/endpoint/user.ts b/src/api/web/endpoint/user.ts index 099d15c00..f2c4347c8 100644 --- a/src/api/web/endpoint/user.ts +++ b/src/api/web/endpoint/user.ts @@ -3,10 +3,10 @@ import _ from 'lodash'; import { Config, JWTSignOptions, RemoteUser } from '@verdaccio/types'; -import { $NextFunctionVer, IAuth } from '../../../../types'; import { getSecurity, validatePassword } from '../../../lib/auth-utils'; import { API_ERROR, APP_ERROR, HEADERS, HTTP_STATUS } from '../../../lib/constants'; import { ErrorCode } from '../../../lib/utils'; +import { $NextFunctionVer, IAuth } from '../../../types'; function addUserAuthApi(auth: IAuth, config: Config): Router { const route = Router(); /* eslint new-cap: 0 */ diff --git a/src/lib/auth-utils.ts b/src/lib/auth-utils.ts index ea7f37b17..9b5879a5a 100644 --- a/src/lib/auth-utils.ts +++ b/src/lib/auth-utils.ts @@ -3,8 +3,8 @@ import _ from 'lodash'; import { APITokenOptions, Callback, Config, IPluginAuth, JWTOptions, Package, RemoteUser, Security } from '@verdaccio/types'; -import { AuthMiddlewarePayload, AuthTokenHeader, BasicPayload, CookieSessionToken, IAuthWebUI } from '../../types'; import { logger } from '../lib/logger'; +import { AuthMiddlewarePayload, AuthTokenHeader, BasicPayload, CookieSessionToken, IAuthWebUI } from '../types'; import { API_ERROR, DEFAULT_MIN_LIMIT_PASSWORD, HTTP_STATUS, ROLES, TIME_EXPIRATION_1H, TOKEN_BASIC, TOKEN_BEARER } from './constants'; import { aesDecrypt, verifyPayload } from './crypto-utils'; import { ErrorCode, convertPayloadToBase64 } from './utils'; diff --git a/src/lib/auth.ts b/src/lib/auth.ts index e2b952ef2..5a68e5fcc 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -5,8 +5,8 @@ import _ from 'lodash'; import { VerdaccioError } from '@verdaccio/commons-api'; import { AllowAccess, AuthPluginPackage, Callback, Config, IPluginAuth, JWTSignOptions, Logger, PackageAccess, RemoteUser, Security } from '@verdaccio/types'; -import { $RequestExtend, $ResponseExtend, AESPayload, IAuth } from '../../types'; import loadPlugin from '../lib/plugin-loader'; +import { $RequestExtend, $ResponseExtend, AESPayload, IAuth } from '../types'; import { createAnonymousRemoteUser, createRemoteUser, diff --git a/src/lib/config-utils.ts b/src/lib/config-utils.ts index 13c98bcdc..38d567785 100644 --- a/src/lib/config-utils.ts +++ b/src/lib/config-utils.ts @@ -4,7 +4,7 @@ import minimatch from 'minimatch'; import { PackageList, UpLinksConfList } from '@verdaccio/types'; -import { LegacyPackageList, MatchedPackage } from '../../types'; +import { LegacyPackageList, MatchedPackage } from '../types'; import { ErrorCode } from './utils'; const BLACKLIST = { diff --git a/src/lib/config.ts b/src/lib/config.ts index 21cd61880..aca88334b 100644 --- a/src/lib/config.ts +++ b/src/lib/config.ts @@ -3,7 +3,7 @@ import _ from 'lodash'; import { Config as AppConfig, Logger, PackageList, RateLimit, Security } from '@verdaccio/types'; -import { MatchedPackage, StartUpConfig } from '../../types'; +import { MatchedPackage, StartUpConfig } from '../types'; import { defaultUserRateLimiting } from './auth-utils'; import { getMatchedPackagesSpec, normalisePackageAccess, sanityCheckUplinksProps, uplinkSanityCheck } from './config-utils'; import { APP_ERROR } from './constants'; diff --git a/src/lib/local-storage.ts b/src/lib/local-storage.ts index 081824c35..1214bc4b3 100644 --- a/src/lib/local-storage.ts +++ b/src/lib/local-storage.ts @@ -27,8 +27,8 @@ import { onSearchPackage, } from '@verdaccio/types'; -import { IStorage, StringValue } from '../../types'; import loadPlugin from '../lib/plugin-loader'; +import { IStorage, StringValue } from '../types'; import { API_ERROR, DIST_TAGS, HTTP_STATUS, STORAGE, SUPPORT_ERRORS, USERS } from './constants'; import { createTarballHash } from './crypto-utils'; import { cleanUpReadme, generatePackageTemplate, generateRevision, getLatestReadme, normalizeContributors, normalizePackage } from './storage-utils'; diff --git a/src/lib/search.ts b/src/lib/search.ts index 34173f150..369fd13c9 100644 --- a/src/lib/search.ts +++ b/src/lib/search.ts @@ -3,7 +3,7 @@ import lunrMutable from 'lunr-mutable-indexes'; import { Version } from '@verdaccio/types'; -import { IStorage, IStorageHandler, IWebSearch } from '../../types'; +import { IStorage, IStorageHandler, IWebSearch } from '../types'; /** * Handle the search Indexer. diff --git a/src/lib/storage-utils.ts b/src/lib/storage-utils.ts index 9e66f834b..df69f3948 100644 --- a/src/lib/storage-utils.ts +++ b/src/lib/storage-utils.ts @@ -2,8 +2,8 @@ import _ from 'lodash'; import { AbbreviatedManifest, AbbreviatedVersions, Author, Manifest, Package, Version } from '@verdaccio/types'; -import { IStorage } from '../../types'; import { generateRandomHexString } from '../lib/crypto-utils'; +import { IStorage } from '../types'; import { API_ERROR, DIST_TAGS, HTTP_STATUS, STORAGE, USERS } from './constants'; import Search from './search'; import { ErrorCode, isObject, normalizeDistTags, semverSort } from './utils'; diff --git a/src/lib/storage.ts b/src/lib/storage.ts index 667eece17..bdbeaee55 100644 --- a/src/lib/storage.ts +++ b/src/lib/storage.ts @@ -8,8 +8,8 @@ import { ReadTarball } from '@verdaccio/streams'; import { Callback, Config, DistFile, IReadTarball, IUploadTarball, Logger, MergeTags, Package, Version, Versions } from '@verdaccio/types'; import { GenericBody, Token, TokenFilter } from '@verdaccio/types'; -import { IGetPackageOptions, IPluginFilters, IProxy, IStorage, IStorageHandler, ISyncUplinks, ProxyList, StringValue } from '../../types'; import { logger } from '../lib/logger'; +import { IGetPackageOptions, IPluginFilters, IProxy, IStorage, IStorageHandler, ISyncUplinks, ProxyList, StringValue } from '../types'; import { hasProxyTo } from './config-utils'; import { API_ERROR, DIST_TAGS, HTTP_STATUS } from './constants'; import LocalStorage from './local-storage'; diff --git a/src/lib/up-storage.ts b/src/lib/up-storage.ts index fe17d964d..125dad598 100644 --- a/src/lib/up-storage.ts +++ b/src/lib/up-storage.ts @@ -9,7 +9,7 @@ import zlib from 'zlib'; import { ReadTarball } from '@verdaccio/streams'; import { Callback, Config, Headers, Logger, Package } from '@verdaccio/types'; -import { IProxy, UpLinkConfLocal } from '../../types'; +import { IProxy, UpLinkConfLocal } from '../types'; import { API_ERROR, CHARACTER_ENCODING, ERROR_CODE, HEADERS, HEADER_TYPE, HTTP_STATUS, TOKEN_BASIC, TOKEN_BEARER } from './constants'; import { logger } from './logger'; import { ErrorCode, buildToken, isObject, isObjectOrArray, parseInterval } from './utils'; diff --git a/src/lib/uplink-util.ts b/src/lib/uplink-util.ts index 1a4944f4d..206e8601e 100644 --- a/src/lib/uplink-util.ts +++ b/src/lib/uplink-util.ts @@ -1,6 +1,6 @@ import { Config, Versions } from '@verdaccio/types'; -import { IProxy, ProxyList } from '../../types'; +import { IProxy, ProxyList } from '../types'; import ProxyStorage from './up-storage'; /** diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 268f8beb7..59143ea0a 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -11,9 +11,10 @@ import validator from 'validator'; // eslint-disable-next-line max-len import { getBadData, getBadRequest, getCode, getConflict, getForbidden, getInternalError, getNotFound, getServiceUnavailable, getUnauthorized } from '@verdaccio/commons-api'; +import { StringValue } from '@verdaccio/types'; import { Author, Config, Package, Version } from '@verdaccio/types'; -import { AuthorAvatar, StringValue } from '../../types'; +import { AuthorAvatar } from '../types'; import { GENERIC_AVATAR, generateGravatarUrl } from '../utils/user'; import { APP_ERROR, DEFAULT_DOMAIN, DEFAULT_PORT, DEFAULT_PROTOCOL, DEFAULT_USER, DIST_TAGS, HEADERS } from './constants'; import { logger } from './logger'; diff --git a/types/index.ts b/src/types/index.ts similarity index 100% rename from types/index.ts rename to src/types/index.ts diff --git a/test/unit/__helper/mock.ts b/test/unit/__helper/mock.ts index 044a82485..4c1285029 100644 --- a/test/unit/__helper/mock.ts +++ b/test/unit/__helper/mock.ts @@ -4,7 +4,7 @@ import { DOMAIN_SERVERS } from '../../functional/config.functional'; import Server from '../../lib/server'; import VerdaccioProcess from '../../lib/server_process'; import { VerdaccioConfig } from '../../lib/verdaccio-server'; -import { IServerBridge } from '../../types'; +import { IServerBridge } from '../types'; /** * Fork a Verdaccio process with a custom configuration. diff --git a/test/unit/modules/auth/auth-utils.spec.ts b/test/unit/modules/auth/auth-utils.spec.ts index 0100e65da..a29f00932 100644 --- a/test/unit/modules/auth/auth-utils.spec.ts +++ b/test/unit/modules/auth/auth-utils.spec.ts @@ -17,7 +17,7 @@ import { CHARACTER_ENCODING, TOKEN_BEARER } from '../../../../src/lib/constants' import { aesDecrypt, verifyPayload } from '../../../../src/lib/crypto-utils'; import { setup } from '../../../../src/lib/logger'; import { buildToken, convertPayloadToBase64, parseConfigFile } from '../../../../src/lib/utils'; -import { IAuth } from '../../../../types'; +import { IAuth } from '../../../types'; import { parseConfigurationFile } from '../../__helper'; import configExample from '../../partials/config'; diff --git a/test/unit/modules/plugin/auth.spec.ts b/test/unit/modules/plugin/auth.spec.ts index 42bbfe281..12089f2c4 100644 --- a/test/unit/modules/plugin/auth.spec.ts +++ b/test/unit/modules/plugin/auth.spec.ts @@ -7,7 +7,7 @@ import Auth from '../../../../src/lib/auth'; import AppConfig from '../../../../src/lib/config'; import { ROLES } from '../../../../src/lib/constants'; import { setup } from '../../../../src/lib/logger'; -import { IAuth } from '../../../../types'; +import { IAuth } from '../../../types'; import { authPluginFailureConf, authPluginPassThrougConf, authProfileConf } from './helper/plugin'; setup([]); diff --git a/test/unit/modules/storage/local-storage.spec.ts b/test/unit/modules/storage/local-storage.spec.ts index 32ce1df25..f6a036449 100644 --- a/test/unit/modules/storage/local-storage.spec.ts +++ b/test/unit/modules/storage/local-storage.spec.ts @@ -9,9 +9,9 @@ import { API_ERROR, DIST_TAGS, HTTP_STATUS } from '../../../../src/lib/constants import LocalStorage from '../../../../src/lib/local-storage'; import { logger, setup } from '../../../../src/lib/logger'; import { generatePackageTemplate } from '../../../../src/lib/storage-utils'; -import { IStorage } from '../../../../types'; import { readFile } from '../../../functional/lib/test.utils'; import { generateNewVersion } from '../../../lib/utils-test'; +import { IStorage } from '../../../types'; // @ts-ignore import configExample from '../../partials/config'; diff --git a/test/unit/modules/storage/store.spec.ts b/test/unit/modules/storage/store.spec.ts index 3b7aeca5a..7eab84433 100644 --- a/test/unit/modules/storage/store.spec.ts +++ b/test/unit/modules/storage/store.spec.ts @@ -9,8 +9,8 @@ import AppConfig from '../../../../src/lib/config'; import { API_ERROR, HTTP_STATUS } from '../../../../src/lib/constants'; import { setup } from '../../../../src/lib/logger'; import Storage from '../../../../src/lib/storage'; -import { IStorageHandler } from '../../../../types'; import { DOMAIN_SERVERS } from '../../../functional/config.functional'; +import { IStorageHandler } from '../../../types'; import { mockServer } from '../../__helper/mock'; import configExample from '../../partials/config'; diff --git a/test/unit/modules/uplinks/up-storage.spec.ts b/test/unit/modules/uplinks/up-storage.spec.ts index 02b1bf231..54ca45f26 100644 --- a/test/unit/modules/uplinks/up-storage.spec.ts +++ b/test/unit/modules/uplinks/up-storage.spec.ts @@ -7,8 +7,8 @@ import AppConfig from '../../../../src/lib/config'; import { API_ERROR, HTTP_STATUS } from '../../../../src/lib/constants'; import { setup } from '../../../../src/lib/logger'; import ProxyStorage from '../../../../src/lib/up-storage'; -import { IProxy } from '../../../../types'; import { DOMAIN_SERVERS } from '../../../functional/config.functional'; +import { IProxy } from '../../../types'; import { mockServer } from '../../__helper/mock'; import configExample from '../../partials/config'; diff --git a/tsconfig.json b/tsconfig.json index fad0562a1..1d360f5d5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,10 +7,11 @@ "strict": true, "strictNullChecks": true, "resolveJsonModule": true, - "outDir": "lib", + "rootDir": "./src", + "outDir": "./build", "allowSyntheticDefaultImports": true, "esModuleInterop": true }, "exclude": ["node_modules", "**/*.spec.ts"], - "include": ["src/**/*.ts", "test/**/*.ts", "types/*.d.ts"] + "include": ["src/**/*.ts", "types/*.d.ts"] } diff --git a/yarn.lock b/yarn.lock index 5673b74c2..6535a488b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1530,7 +1530,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4": +"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.8.4": version: 7.20.1 resolution: "@babel/runtime@npm:7.20.1" dependencies: @@ -3157,26 +3157,6 @@ __metadata: languageName: node linkType: hard -"all-contributors-cli@npm:6.20.0": - version: 6.20.0 - resolution: "all-contributors-cli@npm:6.20.0" - dependencies: - "@babel/runtime": ^7.7.6 - async: ^3.0.1 - chalk: ^4.0.0 - didyoumean: ^1.2.1 - inquirer: ^7.0.4 - json-fixer: ^1.5.1 - lodash: ^4.11.2 - node-fetch: ^2.6.0 - pify: ^5.0.0 - yargs: ^15.0.1 - bin: - all-contributors: dist/cli.js - checksum: 3ac54cc73b75960be0d0304b22301d56f2422d509660860ab5cdb55bce1a3a1d3b3eba63b470a6edbe9568dfc4fd0c8176b0702ea2bdb430376c9c57900f53f4 - languageName: node - linkType: hard - "ansi-colors@npm:^4.1.1": version: 4.1.3 resolution: "ansi-colors@npm:4.1.3" @@ -3440,7 +3420,7 @@ __metadata: languageName: node linkType: hard -"async@npm:3.2.4, async@npm:^3.0.1": +"async@npm:3.2.4": version: 3.2.4 resolution: "async@npm:3.2.4" checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89 @@ -3938,7 +3918,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2": +"chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1": version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -3955,13 +3935,6 @@ __metadata: languageName: node linkType: hard -"chardet@npm:^0.7.0": - version: 0.7.0 - resolution: "chardet@npm:0.7.0" - checksum: 6fd5da1f5d18ff5712c1e0aed41da200d7c51c28f11b36ee3c7b483f3696dabc08927fc6b227735eb8f0e1215c9a8abd8154637f3eff8cada5959df7f58b024d - languageName: node - linkType: hard - "chokidar@npm:^3.4.0": version: 3.5.3 resolution: "chokidar@npm:3.5.3" @@ -4040,13 +4013,6 @@ __metadata: languageName: node linkType: hard -"cli-width@npm:^3.0.0": - version: 3.0.0 - resolution: "cli-width@npm:3.0.0" - checksum: 4c94af3769367a70e11ed69aa6095f1c600c0ff510f3921ab4045af961820d57c0233acfa8b6396037391f31b4c397e1f614d234294f979ff61430a6c166c3f6 - languageName: node - linkType: hard - "clipanion@npm:3.1.0": version: 3.1.0 resolution: "clipanion@npm:3.1.0" @@ -4926,13 +4892,6 @@ __metadata: languageName: node linkType: hard -"didyoumean@npm:^1.2.1": - version: 1.2.2 - resolution: "didyoumean@npm:1.2.2" - checksum: d5d98719d58b3c2fa59663c4c42ba9716f1fd01245c31d5fce31915bd3aa26e6aac149788e007358f778ebbd68a2256eb5973e8ca6f221df221ba060115acf2e - languageName: node - linkType: hard - "diff-sequences@npm:^26.6.2": version: 26.6.2 resolution: "diff-sequences@npm:26.6.2" @@ -5796,17 +5755,6 @@ __metadata: languageName: node linkType: hard -"external-editor@npm:^3.0.3": - version: 3.1.0 - resolution: "external-editor@npm:3.1.0" - dependencies: - chardet: ^0.7.0 - iconv-lite: ^0.4.24 - tmp: ^0.0.33 - checksum: 1c2a616a73f1b3435ce04030261bed0e22d4737e14b090bb48e58865da92529c9f2b05b893de650738d55e692d071819b45e1669259b2b354bc3154d27a698c7 - languageName: node - linkType: hard - "extglob@npm:^2.0.4": version: 2.0.4 resolution: "extglob@npm:2.0.4" @@ -5910,7 +5858,7 @@ __metadata: languageName: node linkType: hard -"figures@npm:^3.0.0, figures@npm:^3.1.0": +"figures@npm:^3.1.0": version: 3.2.0 resolution: "figures@npm:3.2.0" dependencies: @@ -6796,7 +6744,7 @@ __metadata: languageName: node linkType: hard -"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24": +"iconv-lite@npm:0.4.24": version: 0.4.24 resolution: "iconv-lite@npm:0.4.24" dependencies: @@ -6895,27 +6843,6 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:^7.0.4": - version: 7.3.3 - resolution: "inquirer@npm:7.3.3" - dependencies: - ansi-escapes: ^4.2.1 - chalk: ^4.1.0 - cli-cursor: ^3.1.0 - cli-width: ^3.0.0 - external-editor: ^3.0.3 - figures: ^3.0.0 - lodash: ^4.17.19 - mute-stream: 0.0.8 - run-async: ^2.4.0 - rxjs: ^6.6.0 - string-width: ^4.1.0 - strip-ansi: ^6.0.0 - through: ^2.3.6 - checksum: 4d387fc1eb6126acbd58cbdb9ad99d2887d181df86ab0c2b9abdf734e751093e2d5882c2b6dc7144d9ab16b7ab30a78a1d7f01fb6a2850a44aeb175d1e3f8778 - languageName: node - linkType: hard - "internal-slot@npm:^1.0.3": version: 1.0.3 resolution: "internal-slot@npm:1.0.3" @@ -7990,17 +7917,6 @@ __metadata: languageName: node linkType: hard -"json-fixer@npm:^1.5.1": - version: 1.6.15 - resolution: "json-fixer@npm:1.6.15" - dependencies: - "@babel/runtime": ^7.18.9 - chalk: ^4.1.2 - pegjs: ^0.10.0 - checksum: ae805d5155ace57fd588a9ec129efd7324c3ef7f622988c66301eed9380da0acccdd35e9355b307c53051b246e2118d17a40775a2b13f19221574f5f662d4b15 - languageName: node - linkType: hard - "json-parse-better-errors@npm:^1.0.1": version: 1.0.2 resolution: "json-parse-better-errors@npm:1.0.2" @@ -8472,7 +8388,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4, lodash@npm:4.17.21, lodash@npm:^4.11.2, lodash@npm:^4.17.13, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.7.0": +"lodash@npm:4, lodash@npm:4.17.21, lodash@npm:^4.17.13, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.7.0": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -8992,13 +8908,6 @@ __metadata: languageName: node linkType: hard -"mute-stream@npm:0.0.8": - version: 0.0.8 - resolution: "mute-stream@npm:0.0.8" - checksum: ff48d251fc3f827e5b1206cda0ffdaec885e56057ee86a3155e1951bc940fd5f33531774b1cc8414d7668c10a8907f863f6561875ee6e8768931a62121a531a1 - languageName: node - linkType: hard - "mv@npm:2.1.1": version: 2.1.1 resolution: "mv@npm:2.1.1" @@ -9095,7 +9004,7 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:2.6.7, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.7": +"node-fetch@npm:2.6.7, node-fetch@npm:^2.6.7": version: 2.6.7 resolution: "node-fetch@npm:2.6.7" dependencies: @@ -9431,13 +9340,6 @@ __metadata: languageName: node linkType: hard -"os-tmpdir@npm:~1.0.2": - version: 1.0.2 - resolution: "os-tmpdir@npm:1.0.2" - checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d - languageName: node - linkType: hard - "p-each-series@npm:^2.1.0": version: 2.2.0 resolution: "p-each-series@npm:2.2.0" @@ -9669,15 +9571,6 @@ __metadata: languageName: node linkType: hard -"pegjs@npm:^0.10.0": - version: 0.10.0 - resolution: "pegjs@npm:0.10.0" - bin: - pegjs: bin/pegjs - checksum: 65d184ca0e1823ec0a3e7f384d7fd771bcbbc7abf460c82c9704022c1fa325425dc9007c92982b951879c3c9d4c39bf5cd6d99690e0540ff5016c04ca1ecd17e - languageName: node - linkType: hard - "performance-now@npm:^2.1.0": version: 2.1.0 resolution: "performance-now@npm:2.1.0" @@ -9720,13 +9613,6 @@ __metadata: languageName: node linkType: hard -"pify@npm:^5.0.0": - version: 5.0.0 - resolution: "pify@npm:5.0.0" - checksum: 443e3e198ad6bfa8c0c533764cf75c9d5bc976387a163792fb553ffe6ce923887cf14eebf5aea9b7caa8eab930da8c33612990ae85bd8c2bc18bedb9eae94ecb - languageName: node - linkType: hard - "pino-std-serializers@npm:^3.1.0": version: 3.2.0 resolution: "pino-std-serializers@npm:3.2.0" @@ -10447,13 +10333,6 @@ __metadata: languageName: node linkType: hard -"run-async@npm:^2.4.0": - version: 2.4.1 - resolution: "run-async@npm:2.4.1" - checksum: a2c88aa15df176f091a2878eb840e68d0bdee319d8d97bbb89112223259cebecb94bc0defd735662b83c2f7a30bed8cddb7d1674eb48ae7322dc602b22d03797 - languageName: node - linkType: hard - "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -10463,15 +10342,6 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^6.6.0": - version: 6.6.7 - resolution: "rxjs@npm:6.6.7" - dependencies: - tslib: ^1.9.0 - checksum: bc334edef1bb8bbf56590b0b25734ba0deaf8825b703256a93714308ea36dff8a11d25533671adf8e104e5e8f256aa6fdfe39b2e248cdbd7a5f90c260acbbd1b - languageName: node - linkType: hard - "rxjs@npm:^7.5.1": version: 7.5.7 resolution: "rxjs@npm:7.5.7" @@ -11382,7 +11252,7 @@ __metadata: languageName: node linkType: hard -"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.6, through@npm:^2.3.8": +"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.8": version: 2.3.8 resolution: "through@npm:2.3.8" checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd @@ -11399,15 +11269,6 @@ __metadata: languageName: node linkType: hard -"tmp@npm:^0.0.33": - version: 0.0.33 - resolution: "tmp@npm:0.0.33" - dependencies: - os-tmpdir: ~1.0.2 - checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28 - languageName: node - linkType: hard - "tmpl@npm:1.0.5": version: 1.0.5 resolution: "tmpl@npm:1.0.5" @@ -11564,7 +11425,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.8.1, tslib@npm:^1.9.0": +"tslib@npm:^1.8.1": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd @@ -12101,7 +11962,6 @@ __metadata: "@verdaccio/types": 10.7.0 "@verdaccio/ui-theme": 6.0.0-6-next.51 JSONStream: 1.3.5 - all-contributors-cli: 6.20.0 async: 3.2.4 babel-eslint: 10.1.0 babel-jest: 26.6.3 @@ -12468,7 +12328,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^15.0.1, yargs@npm:^15.4.1": +"yargs@npm:^15.4.1": version: 15.4.1 resolution: "yargs@npm:15.4.1" dependencies: