diff --git a/.pnp.cjs b/.pnp.cjs index f5a093e1d86e..0f2cdf4611a9 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -69,7 +69,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/parser", "virtual:7f7b3df50ee4b7b1719ad19fad11505dc2788f3227a7e5cc9ca19f71d8cb309c9d33b532ea2b2b60ab65abf6cc12153df4643c5e6e17d01ea0ae0492723bb4b4#npm:5.49.0"],\ ["@verdaccio-scope/verdaccio-auth-foo", "npm:0.0.2"],\ ["@verdaccio/config", "npm:6.0.0-6-next.61"],\ - ["@verdaccio/core", "npm:6.0.0-6-next.61"],\ + ["@verdaccio/core", "npm:6.0.0-6-next.62"],\ ["@verdaccio/local-storage", "npm:10.3.1"],\ ["@verdaccio/logger-7", "npm:6.0.0-6-next.6"],\ ["@verdaccio/middleware", "npm:6.0.0-6-next.40"],\ @@ -4530,6 +4530,19 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["semver", "npm:7.3.8"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:6.0.0-6-next.62", {\ + "packageLocation": "./.yarn/cache/@verdaccio-core-npm-6.0.0-6-next.62-8bb88ecdeb-628c35522e.zip/node_modules/@verdaccio/core/",\ + "packageDependencies": [\ + ["@verdaccio/core", "npm:6.0.0-6-next.62"],\ + ["ajv", "npm:8.11.2"],\ + ["core-js", "npm:3.28.0"],\ + ["http-errors", "npm:1.8.1"],\ + ["http-status-codes", "npm:2.2.0"],\ + ["process-warning", "npm:1.0.0"],\ + ["semver", "npm:7.3.8"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@verdaccio/file-locking", [\ @@ -6316,6 +6329,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["core-js", "npm:3.27.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.28.0", {\ + "packageLocation": "./.yarn/unplugged/core-js-npm-3.28.0-495770dfdb/node_modules/core-js/",\ + "packageDependencies": [\ + ["core-js", "npm:3.28.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["core-js-compat", [\ @@ -13494,7 +13514,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@typescript-eslint/parser", "virtual:7f7b3df50ee4b7b1719ad19fad11505dc2788f3227a7e5cc9ca19f71d8cb309c9d33b532ea2b2b60ab65abf6cc12153df4643c5e6e17d01ea0ae0492723bb4b4#npm:5.49.0"],\ ["@verdaccio-scope/verdaccio-auth-foo", "npm:0.0.2"],\ ["@verdaccio/config", "npm:6.0.0-6-next.61"],\ - ["@verdaccio/core", "npm:6.0.0-6-next.61"],\ + ["@verdaccio/core", "npm:6.0.0-6-next.62"],\ ["@verdaccio/local-storage", "npm:10.3.1"],\ ["@verdaccio/logger-7", "npm:6.0.0-6-next.6"],\ ["@verdaccio/middleware", "npm:6.0.0-6-next.40"],\ diff --git a/.yarn/cache/@verdaccio-core-npm-6.0.0-6-next.62-8bb88ecdeb-628c35522e.zip b/.yarn/cache/@verdaccio-core-npm-6.0.0-6-next.62-8bb88ecdeb-628c35522e.zip new file mode 100644 index 000000000000..91043ae3d247 Binary files /dev/null and b/.yarn/cache/@verdaccio-core-npm-6.0.0-6-next.62-8bb88ecdeb-628c35522e.zip differ diff --git a/.yarn/cache/core-js-npm-3.28.0-495770dfdb-3155fd0ec1.zip b/.yarn/cache/core-js-npm-3.28.0-495770dfdb-3155fd0ec1.zip new file mode 100644 index 000000000000..89df36154441 Binary files /dev/null and b/.yarn/cache/core-js-npm-3.28.0-495770dfdb-3155fd0ec1.zip differ diff --git a/package.json b/package.json index d2a232b596a2..db1d063d6dc3 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@verdaccio/config": "6.0.0-6-next.61", - "@verdaccio/core": "6.0.0-6-next.61", + "@verdaccio/core": "6.0.0-6-next.62", "@verdaccio/local-storage": "10.3.1", "@verdaccio/logger-7": "6.0.0-6-next.6", "@verdaccio/middleware": "6.0.0-6-next.40", diff --git a/src/lib/up-storage.ts b/src/lib/up-storage.ts index 95fe243c5d30..cfe51a374388 100644 --- a/src/lib/up-storage.ts +++ b/src/lib/up-storage.ts @@ -215,7 +215,7 @@ class ProxyStorage implements IProxy { } } : undefined; - let requestOptions = { + let requestOptions: request.OptionsWithUrl = { url: uri, method: method, headers: headers, diff --git a/test/unit/modules/uplinks/up-storage.spec.ts b/test/unit/modules/uplinks/up-storage.spec.ts index 8c073d4b9db7..b306636204f1 100644 --- a/test/unit/modules/uplinks/up-storage.spec.ts +++ b/test/unit/modules/uplinks/up-storage.spec.ts @@ -12,7 +12,7 @@ import configExample from '../../partials/config'; setup({}); -describe('UpStorge', () => { +describe('UpStorage', () => { const mockServerPort = 55547; let mockRegistry; const uplinkDefault = { @@ -39,7 +39,7 @@ describe('UpStorge', () => { expect(proxy).toBeDefined(); }); - describe('UpStorge::getRemoteMetadata', () => { + describe('UpStorage::getRemoteMetadata', () => { test('should be get remote metadata', (done) => { const proxy = generateProxy(); @@ -72,9 +72,19 @@ describe('UpStorge', () => { done(); }); }); + + test('should be get remote metadata with json when uplink is npmmirror', (done) => { + const proxy = generateProxy({ url: 'https://registry.npmmirror.com' }); + + proxy.getRemoteMetadata('jquery', { json: true }, (err, data) => { + expect(err).toBeNull(); + expect(data.name).toBe('jquery'); + done(); + }); + }); }); - describe('UpStorge::fetchTarball', () => { + describe('UpStorage::fetchTarball', () => { test('should fetch a tarball from uplink', (done) => { const proxy = generateProxy(); const tarball = `http://${DOMAIN_SERVERS}:${mockServerPort}/jquery/-/jquery-1.5.1.tgz`; @@ -147,7 +157,7 @@ describe('UpStorge', () => { }, 10000); }); - describe('UpStorge::isUplinkValid', () => { + describe('UpStorage::isUplinkValid', () => { describe('valid use cases', () => { const validateUpLink = ( url: string, diff --git a/yarn.lock b/yarn.lock index a2477cef29f4..968403d31ffa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2840,6 +2840,20 @@ __metadata: languageName: node linkType: hard +"@verdaccio/core@npm:6.0.0-6-next.62": + version: 6.0.0-6-next.62 + resolution: "@verdaccio/core@npm:6.0.0-6-next.62" + dependencies: + ajv: 8.11.2 + core-js: 3.28.0 + http-errors: 1.8.1 + http-status-codes: 2.2.0 + process-warning: 1.0.0 + semver: 7.3.8 + checksum: 628c35522e48b57aa01b9fa4ee869da7d3c8b9ac43905fe783a44d6e9f49b85a2298ee153b947c759cbc237ed9aba350fab2dd6698e74ebff6b9740a949d5718 + languageName: node + linkType: hard + "@verdaccio/file-locking@npm:10.3.0": version: 10.3.0 resolution: "@verdaccio/file-locking@npm:10.3.0" @@ -4326,6 +4340,13 @@ __metadata: languageName: node linkType: hard +"core-js@npm:3.28.0": + version: 3.28.0 + resolution: "core-js@npm:3.28.0" + checksum: 3155fd0ec16d0089106b145e9595280a4ea4bde0d7ff26aa14364cd4f1c203baf6620c3025acd284f363d08b9f21104101692766ca9a36ffeee7307bdf3e1881 + languageName: node + linkType: hard + "core-js@npm:^2.6.5": version: 2.6.12 resolution: "core-js@npm:2.6.12" @@ -10588,7 +10609,7 @@ __metadata: "@typescript-eslint/parser": 5.49.0 "@verdaccio-scope/verdaccio-auth-foo": 0.0.2 "@verdaccio/config": 6.0.0-6-next.61 - "@verdaccio/core": 6.0.0-6-next.61 + "@verdaccio/core": 6.0.0-6-next.62 "@verdaccio/local-storage": 10.3.1 "@verdaccio/logger-7": 6.0.0-6-next.6 "@verdaccio/middleware": 6.0.0-6-next.40