@verdaccio/tarball 11.0.0-6-next.7 → 11.0.0-6-next.11

package/CHANGELOG.md

@@ -1,5 +1,85 @@
 # Change Log
 
+## 11.0.0-6-next.11
+
+### Major Changes
+
+- a828271d: refactor: download manifest endpoint and integrate fastify
+
+  Much simpler API for fetching a package
+
+  ```
+   const manifest = await storage.getPackageNext({
+        name,
+        uplinksLook: true,
+        req,
+        version: queryVersion,
+        requestOptions,
+   });
+  ```
+
+  > not perfect, the `req` still is being passed to the proxy (this has to be refactored at proxy package) and then removed from here, in proxy we pass the request instance to the `request` library.
+
+  ### Details
+
+  - `async/await` sugar for getPackage()
+  - Improve and reuse code between current implementation and new fastify endpoint (add scaffolding for request manifest)
+  - Improve performance
+  - Add new tests
+
+  ### Breaking changes
+
+  All storage plugins will stop to work since the storage uses `getPackageNext` method which is Promise based, I won't replace this now because will force me to update all plugins, I'll follow up in another PR. Currently will throw http 500
+
+### Minor Changes
+
+- 24b9be02: refactor: improve docker image build with strict dependencies and prod build
+
+### Patch Changes
+
+- Updated dependencies [a828271d]
+- Updated dependencies [24b9be02]
+- Updated dependencies [b13a3fef]
+  - @verdaccio/utils@6.0.0-6-next.10
+  - @verdaccio/core@6.0.0-6-next.4
+  - @verdaccio/url@11.0.0-6-next.8
+
+## 11.0.0-6-next.10
+
+### Patch Changes
+
+- Updated dependencies [f86c31ed]
+  - @verdaccio/utils@6.0.0-6-next.9
+
+## 11.0.0-6-next.9
+
+### Patch Changes
+
+- Updated dependencies [6c1eb021]
+  - @verdaccio/core@6.0.0-6-next.3
+  - @verdaccio/url@11.0.0-6-next.7
+  - @verdaccio/utils@6.0.0-6-next.8
+
+## 11.0.0-6-next.8
+
+### Major Changes
+
+- 794af76c: Remove Node 12 support
+
+  - We need move to the new `undici` and does not support Node.js 12
+
+### Minor Changes
+
+- 154b2ecd: refactor: remove @verdaccio/commons-api in favor @verdaccio/core and remove duplications
+
+### Patch Changes
+
+- Updated dependencies [794af76c]
+- Updated dependencies [154b2ecd]
+  - @verdaccio/core@6.0.0-6-next.2
+  - @verdaccio/url@11.0.0-6-next.6
+  - @verdaccio/utils@6.0.0-6-next.7
+
 ## 11.0.0-6-next.7
 
 ### Patch Changes

package/build/convertDistRemoteToLocalTarballUrls.d.ts

@@ -1,5 +1,5 @@
 import { Package } from '@verdaccio/types';
-import { Request } from 'express';
+import { RequestOptions } from '@verdaccio/url';
 /**
  * Iterate a packages's versions and filter each original tarball url.
  * @param {*} pkg
@@ -7,4 +7,4 @@ import { Request } from 'express';
  * @param {*} config
  * @return {String} a filtered package
  */
-export declare function convertDistRemoteToLocalTarballUrls(pkg: Package, req: Request, urlPrefix: string | void): Package;
+export declare function convertDistRemoteToLocalTarballUrls(pkg: Package, request: RequestOptions, urlPrefix: string | void): Package;

package/build/convertDistRemoteToLocalTarballUrls.js

@@ -18,13 +18,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {*} config
  * @return {String} a filtered package
  */
-function convertDistRemoteToLocalTarballUrls(pkg, req, urlPrefix) {
+function convertDistRemoteToLocalTarballUrls(pkg, request, urlPrefix) {
   for (const ver in pkg.versions) {
     if (Object.prototype.hasOwnProperty.call(pkg.versions, ver)) {
       const distName = pkg.versions[ver].dist;
 
       if (_lodash.default.isNull(distName) === false && _lodash.default.isNull(distName.tarball) === false) {
-        distName.tarball = (0, _getLocalRegistryTarballUri.getLocalRegistryTarballUri)(distName.tarball, pkg.name, req, urlPrefix);
+        distName.tarball = (0, _getLocalRegistryTarballUri.getLocalRegistryTarballUri)(distName.tarball, pkg.name, request, urlPrefix);
       }
     }
   }

package/build/convertDistRemoteToLocalTarballUrls.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/convertDistRemoteToLocalTarballUrls.ts"],"names":["convertDistRemoteToLocalTarballUrls","pkg","req","urlPrefix","ver","versions","Object","prototype","hasOwnProperty","call","distName","dist","_","isNull","tarball","name"],"mappings":";;;;;;;AAEA;;AAEA;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,mCAAT,CACLC,GADK,EAELC,GAFK,EAGLC,SAHK,EAII;AACT,OAAK,MAAMC,GAAX,IAAkBH,GAAG,CAACI,QAAtB,EAAgC;AAC9B,QAAIC,MAAM,CAACC,SAAP,CAAiBC,cAAjB,CAAgCC,IAAhC,CAAqCR,GAAG,CAACI,QAAzC,EAAmDD,GAAnD,CAAJ,EAA6D;AAC3D,YAAMM,QAAQ,GAAGT,GAAG,CAACI,QAAJ,CAAaD,GAAb,EAAkBO,IAAnC;;AAEA,UAAIC,gBAAEC,MAAF,CAASH,QAAT,MAAuB,KAAvB,IAAgCE,gBAAEC,MAAF,CAASH,QAAQ,CAACI,OAAlB,MAA+B,KAAnE,EAA0E;AACxEJ,QAAAA,QAAQ,CAACI,OAAT,GAAmB,4DAA2BJ,QAAQ,CAACI,OAApC,EAA6Cb,GAAG,CAACc,IAAjD,EAAuDb,GAAvD,EAA4DC,SAA5D,CAAnB;AACD;AACF;AACF;;AACD,SAAOF,GAAP;AACD","sourcesContent":["import { Package } from '@verdaccio/types';\nimport { Request } from 'express';\nimport _ from 'lodash';\n\nimport { getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';\n\n/**\n * Iterate a packages's versions and filter each original tarball url.\n * @param {*} pkg\n * @param {*} req\n * @param {*} config\n * @return {String} a filtered package\n */\nexport function convertDistRemoteToLocalTarballUrls(\n  pkg: Package,\n  req: Request,\n  urlPrefix: string | void\n): Package {\n  for (const ver in pkg.versions) {\n    if (Object.prototype.hasOwnProperty.call(pkg.versions, ver)) {\n      const distName = pkg.versions[ver].dist;\n\n      if (_.isNull(distName) === false && _.isNull(distName.tarball) === false) {\n        distName.tarball = getLocalRegistryTarballUri(distName.tarball, pkg.name, req, urlPrefix);\n      }\n    }\n  }\n  return pkg;\n}\n"],"file":"convertDistRemoteToLocalTarballUrls.js"}
+{"version":3,"sources":["../src/convertDistRemoteToLocalTarballUrls.ts"],"names":["convertDistRemoteToLocalTarballUrls","pkg","request","urlPrefix","ver","versions","Object","prototype","hasOwnProperty","call","distName","dist","_","isNull","tarball","name"],"mappings":";;;;;;;AAAA;;AAKA;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,mCAAT,CACLC,GADK,EAELC,OAFK,EAGLC,SAHK,EAII;AACT,OAAK,MAAMC,GAAX,IAAkBH,GAAG,CAACI,QAAtB,EAAgC;AAC9B,QAAIC,MAAM,CAACC,SAAP,CAAiBC,cAAjB,CAAgCC,IAAhC,CAAqCR,GAAG,CAACI,QAAzC,EAAmDD,GAAnD,CAAJ,EAA6D;AAC3D,YAAMM,QAAQ,GAAGT,GAAG,CAACI,QAAJ,CAAaD,GAAb,EAAkBO,IAAnC;;AAEA,UAAIC,gBAAEC,MAAF,CAASH,QAAT,MAAuB,KAAvB,IAAgCE,gBAAEC,MAAF,CAASH,QAAQ,CAACI,OAAlB,MAA+B,KAAnE,EAA0E;AACxEJ,QAAAA,QAAQ,CAACI,OAAT,GAAmB,4DACjBJ,QAAQ,CAACI,OADQ,EAEjBb,GAAG,CAACc,IAFa,EAGjBb,OAHiB,EAIjBC,SAJiB,CAAnB;AAMD;AACF;AACF;;AACD,SAAOF,GAAP;AACD","sourcesContent":["import _ from 'lodash';\n\nimport { Package } from '@verdaccio/types';\nimport { RequestOptions } from '@verdaccio/url';\n\nimport { getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';\n\n/**\n * Iterate a packages's versions and filter each original tarball url.\n * @param {*} pkg\n * @param {*} req\n * @param {*} config\n * @return {String} a filtered package\n */\nexport function convertDistRemoteToLocalTarballUrls(\n  pkg: Package,\n  request: RequestOptions,\n  urlPrefix: string | void\n): Package {\n  for (const ver in pkg.versions) {\n    if (Object.prototype.hasOwnProperty.call(pkg.versions, ver)) {\n      const distName = pkg.versions[ver].dist;\n\n      if (_.isNull(distName) === false && _.isNull(distName.tarball) === false) {\n        distName.tarball = getLocalRegistryTarballUri(\n          distName.tarball,\n          pkg.name,\n          request,\n          urlPrefix\n        );\n      }\n    }\n  }\n  return pkg;\n}\n"],"file":"convertDistRemoteToLocalTarballUrls.js"}

package/build/getLocalRegistryTarballUri.d.ts

@@ -1,7 +1,8 @@
-import { Request } from 'express';
+import { RequestOptions } from '@verdaccio/url';
+export declare function extractTarballFromUrl(url: string): string;
 /**
  * Filter a tarball url.
  * @param {*} uri
  * @return {String} a parsed url
  */
-export declare function getLocalRegistryTarballUri(uri: string, pkgName: string, req: Request, urlPrefix: string | void): string;
+export declare function getLocalRegistryTarballUri(uri: string, pkgName: string, requestOptions: RequestOptions, urlPrefix: string | void): string;

package/build/getLocalRegistryTarballUri.js

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.extractTarballFromUrl = extractTarballFromUrl;
 exports.getLocalRegistryTarballUri = getLocalRegistryTarballUri;
 
-var _url = _interopRequireDefault(require("url"));
-
 var _debug = _interopRequireDefault(require("debug"));
 
+var _url = _interopRequireDefault(require("url"));
+
 var _url2 = require("@verdaccio/url");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -26,8 +27,10 @@ function extractTarballFromUrl(url) {
  */
 
 
-function getLocalRegistryTarballUri(uri, pkgName, req, urlPrefix) {
-  const currentHost = req.headers.host;
+function getLocalRegistryTarballUri(uri, pkgName, requestOptions, urlPrefix) {
+  var _requestOptions$heade;
+
+  const currentHost = requestOptions === null || requestOptions === void 0 ? void 0 : (_requestOptions$heade = requestOptions.headers) === null || _requestOptions$heade === void 0 ? void 0 : _requestOptions$heade.host;
 
   if (!currentHost) {
     return uri;
@@ -36,7 +39,7 @@ function getLocalRegistryTarballUri(uri, pkgName, req, urlPrefix) {
   const tarballName = extractTarballFromUrl(uri);
   debug('tarball name %o', tarballName); // header only set with proxy that setup with HTTPS
 
-  const domainRegistry = (0, _url2.getPublicUrl)(urlPrefix || '', req);
+  const domainRegistry = (0, _url2.getPublicUrl)(urlPrefix || '', requestOptions);
   return `${domainRegistry}${pkgName}/-/${tarballName}`;
 }
 //# sourceMappingURL=getLocalRegistryTarballUri.js.map

package/build/getLocalRegistryTarballUri.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/getLocalRegistryTarballUri.ts"],"names":["debug","extractTarballFromUrl","url","URL","parse","pathname","replace","getLocalRegistryTarballUri","uri","pkgName","req","urlPrefix","currentHost","headers","host","tarballName","domainRegistry"],"mappings":";;;;;;;AAAA;;AAEA;;AAEA;;;;AAEA,MAAMA,KAAK,GAAG,oBAAW,oBAAX,CAAd;;AAEA,SAASC,qBAAT,CAA+BC,GAA/B,EAAoD;AAClD;AACA,SAAOC,aAAIC,KAAJ,CAAUF,GAAV,EAAeG,QAAf,CAAwBC,OAAxB,CAAgC,OAAhC,EAAyC,EAAzC,CAAP;AACD;AACD;AACA;AACA;AACA;AACA;;;AACO,SAASC,0BAAT,CACLC,GADK,EAELC,OAFK,EAGLC,GAHK,EAILC,SAJK,EAKG;AACR,QAAMC,WAAW,GAAGF,GAAG,CAACG,OAAJ,CAAYC,IAAhC;;AAEA,MAAI,CAACF,WAAL,EAAkB;AAChB,WAAOJ,GAAP;AACD;;AACD,QAAMO,WAAW,GAAGd,qBAAqB,CAACO,GAAD,CAAzC;AACAR,EAAAA,KAAK,CAAC,iBAAD,EAAoBe,WAApB,CAAL,CAPQ,CAQR;;AACA,QAAMC,cAAc,GAAG,wBAAaL,SAAS,IAAI,EAA1B,EAA8BD,GAA9B,CAAvB;AAEA,SAAQ,GAAEM,cAAe,GAAEP,OAAQ,MAAKM,WAAY,EAApD;AACD","sourcesContent":["import URL from 'url';\nimport { Request } from 'express';\nimport buildDebug from 'debug';\n\nimport { getPublicUrl } from '@verdaccio/url';\n\nconst debug = buildDebug('verdaccio:core:url');\n\nfunction extractTarballFromUrl(url: string): string {\n  // @ts-ignore\n  return URL.parse(url).pathname.replace(/^.*\\//, '');\n}\n/**\n * Filter a tarball url.\n * @param {*} uri\n * @return {String} a parsed url\n */\nexport function getLocalRegistryTarballUri(\n  uri: string,\n  pkgName: string,\n  req: Request,\n  urlPrefix: string | void\n): string {\n  const currentHost = req.headers.host;\n\n  if (!currentHost) {\n    return uri;\n  }\n  const tarballName = extractTarballFromUrl(uri);\n  debug('tarball name %o', tarballName);\n  // header only set with proxy that setup with HTTPS\n  const domainRegistry = getPublicUrl(urlPrefix || '', req);\n\n  return `${domainRegistry}${pkgName}/-/${tarballName}`;\n}\n"],"file":"getLocalRegistryTarballUri.js"}
+{"version":3,"sources":["../src/getLocalRegistryTarballUri.ts"],"names":["debug","extractTarballFromUrl","url","URL","parse","pathname","replace","getLocalRegistryTarballUri","uri","pkgName","requestOptions","urlPrefix","currentHost","headers","host","tarballName","domainRegistry"],"mappings":";;;;;;;;AAAA;;AACA;;AAGA;;;;AAEA,MAAMA,KAAK,GAAG,oBAAW,oBAAX,CAAd;;AAEO,SAASC,qBAAT,CAA+BC,GAA/B,EAAoD;AACzD;AACA,SAAOC,aAAIC,KAAJ,CAAUF,GAAV,EAAeG,QAAf,CAAwBC,OAAxB,CAAgC,OAAhC,EAAyC,EAAzC,CAAP;AACD;AACD;AACA;AACA;AACA;AACA;;;AACO,SAASC,0BAAT,CACLC,GADK,EAELC,OAFK,EAGLC,cAHK,EAILC,SAJK,EAKG;AAAA;;AACR,QAAMC,WAAW,GAAGF,cAAH,aAAGA,cAAH,gDAAGA,cAAc,CAAEG,OAAnB,0DAAG,sBAAyBC,IAA7C;;AAEA,MAAI,CAACF,WAAL,EAAkB;AAChB,WAAOJ,GAAP;AACD;;AACD,QAAMO,WAAW,GAAGd,qBAAqB,CAACO,GAAD,CAAzC;AACAR,EAAAA,KAAK,CAAC,iBAAD,EAAoBe,WAApB,CAAL,CAPQ,CAQR;;AACA,QAAMC,cAAc,GAAG,wBAAaL,SAAS,IAAI,EAA1B,EAA8BD,cAA9B,CAAvB;AAEA,SAAQ,GAAEM,cAAe,GAAEP,OAAQ,MAAKM,WAAY,EAApD;AACD","sourcesContent":["import buildDebug from 'debug';\nimport URL from 'url';\n\nimport { RequestOptions } from '@verdaccio/url';\nimport { getPublicUrl } from '@verdaccio/url';\n\nconst debug = buildDebug('verdaccio:core:url');\n\nexport function extractTarballFromUrl(url: string): string {\n  // @ts-ignore\n  return URL.parse(url).pathname.replace(/^.*\\//, '');\n}\n/**\n * Filter a tarball url.\n * @param {*} uri\n * @return {String} a parsed url\n */\nexport function getLocalRegistryTarballUri(\n  uri: string,\n  pkgName: string,\n  requestOptions: RequestOptions,\n  urlPrefix: string | void\n): string {\n  const currentHost = requestOptions?.headers?.host;\n\n  if (!currentHost) {\n    return uri;\n  }\n  const tarballName = extractTarballFromUrl(uri);\n  debug('tarball name %o', tarballName);\n  // header only set with proxy that setup with HTTPS\n  const domainRegistry = getPublicUrl(urlPrefix || '', requestOptions);\n\n  return `${domainRegistry}${pkgName}/-/${tarballName}`;\n}\n"],"file":"getLocalRegistryTarballUri.js"}

package/build/index.d.ts

@@ -1,2 +1,4 @@
+import { RequestOptions } from '@verdaccio/url';
 export { convertDistRemoteToLocalTarballUrls } from './convertDistRemoteToLocalTarballUrls';
 export { getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';
+export { RequestOptions };

package/build/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "RequestOptions", {
+  enumerable: true,
+  get: function () {
+    return _url.RequestOptions;
+  }
+});
 Object.defineProperty(exports, "convertDistRemoteToLocalTarballUrls", {
   enumerable: true,
   get: function () {
@@ -16,6 +22,8 @@ Object.defineProperty(exports, "getLocalRegistryTarballUri", {
   }
 });
 
+var _url = require("@verdaccio/url");
+
 var _convertDistRemoteToLocalTarballUrls = require("./convertDistRemoteToLocalTarballUrls");
 
 var _getLocalRegistryTarballUri = require("./getLocalRegistryTarballUri");

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA;;AACA","sourcesContent":["export { convertDistRemoteToLocalTarballUrls } from './convertDistRemoteToLocalTarballUrls';\nexport { getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAEA;;AACA","sourcesContent":["import { RequestOptions } from '@verdaccio/url';\n\nexport { convertDistRemoteToLocalTarballUrls } from './convertDistRemoteToLocalTarballUrls';\nexport { getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';\n\nexport { RequestOptions };\n"],"file":"index.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@verdaccio/tarball",
-	"version": "11.0.0-6-next.7",
+	"version": "11.0.0-6-next.11",
 	"description": "tarball utilities resolver",
 	"keywords": [
 		"private",
@@ -19,7 +19,7 @@
 	"license": "MIT",
 	"homepage": "https://verdaccio.org",
 	"engines": {
-		"node": ">=10",
+		"node": ">=14",
 		"npm": ">=6"
 	},
 	"repository": {
@@ -34,14 +34,14 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@verdaccio/commons-api": "11.0.0-6-next.4",
-		"@verdaccio/url": "11.0.0-6-next.5",
-		"@verdaccio/utils": "6.0.0-6-next.6",
+		"debug": "4.3.3",
+		"@verdaccio/core": "6.0.0-6-next.4",
+		"@verdaccio/url": "11.0.0-6-next.8",
+		"@verdaccio/utils": "6.0.0-6-next.10",
 		"lodash": "4.17.21"
 	},
 	"devDependencies": {
-		"@verdaccio/types": "11.0.0-6-next.8",
-		"express": "4.17.1",
+		"@verdaccio/types": "11.0.0-6-next.10",
 		"node-mocks-http": "1.10.1"
 	},
 	"funding": {

package/src/convertDistRemoteToLocalTarballUrls.ts

@@ -1,7 +1,8 @@
-import { Package } from '@verdaccio/types';
-import { Request } from 'express';
 import _ from 'lodash';
 
+import { Package } from '@verdaccio/types';
+import { RequestOptions } from '@verdaccio/url';
+
 import { getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';
 
 /**
@@ -13,7 +14,7 @@ import { getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';
  */
 export function convertDistRemoteToLocalTarballUrls(
   pkg: Package,
-  req: Request,
+  request: RequestOptions,
   urlPrefix: string | void
 ): Package {
   for (const ver in pkg.versions) {
@@ -21,7 +22,12 @@ export function convertDistRemoteToLocalTarballUrls(
       const distName = pkg.versions[ver].dist;
 
       if (_.isNull(distName) === false && _.isNull(distName.tarball) === false) {
-        distName.tarball = getLocalRegistryTarballUri(distName.tarball, pkg.name, req, urlPrefix);
+        distName.tarball = getLocalRegistryTarballUri(
+          distName.tarball,
+          pkg.name,
+          request,
+          urlPrefix
+        );
       }
     }
   }

package/src/getLocalRegistryTarballUri.ts

@@ -1,12 +1,12 @@
-import URL from 'url';
-import { Request } from 'express';
 import buildDebug from 'debug';
+import URL from 'url';
 
+import { RequestOptions } from '@verdaccio/url';
 import { getPublicUrl } from '@verdaccio/url';
 
 const debug = buildDebug('verdaccio:core:url');
 
-function extractTarballFromUrl(url: string): string {
+export function extractTarballFromUrl(url: string): string {
   // @ts-ignore
   return URL.parse(url).pathname.replace(/^.*\//, '');
 }
@@ -18,10 +18,10 @@ function extractTarballFromUrl(url: string): string {
 export function getLocalRegistryTarballUri(
   uri: string,
   pkgName: string,
-  req: Request,
+  requestOptions: RequestOptions,
   urlPrefix: string | void
 ): string {
-  const currentHost = req.headers.host;
+  const currentHost = requestOptions?.headers?.host;
 
   if (!currentHost) {
     return uri;
@@ -29,7 +29,7 @@ export function getLocalRegistryTarballUri(
   const tarballName = extractTarballFromUrl(uri);
   debug('tarball name %o', tarballName);
   // header only set with proxy that setup with HTTPS
-  const domainRegistry = getPublicUrl(urlPrefix || '', req);
+  const domainRegistry = getPublicUrl(urlPrefix || '', requestOptions);
 
   return `${domainRegistry}${pkgName}/-/${tarballName}`;
 }

package/src/index.ts

@@ -1,2 +1,6 @@
+import { RequestOptions } from '@verdaccio/url';
+
 export { convertDistRemoteToLocalTarballUrls } from './convertDistRemoteToLocalTarballUrls';
 export { getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';
+
+export { RequestOptions };

package/tests/convertDistRemoteToLocalTarballUrls.spec.ts

@@ -1,5 +1,7 @@
 import * as httpMocks from 'node-mocks-http';
-import { HEADERS } from '@verdaccio/commons-api';
+
+import { HEADERS } from '@verdaccio/core';
+
 import { convertDistRemoteToLocalTarballUrls } from '../src';
 
 describe('convertDistRemoteToLocalTarballUrls', () => {
@@ -30,7 +32,11 @@ describe('convertDistRemoteToLocalTarballUrls', () => {
       },
       url: '/',
     });
-    const convertDist = convertDistRemoteToLocalTarballUrls(cloneMetadata(), req);
+    const convertDist = convertDistRemoteToLocalTarballUrls(cloneMetadata(), {
+      host: req.hostname,
+      headers: req.headers as any,
+      protocol: req.protocol,
+    });
     expect(convertDist.versions['1.0.0'].dist.tarball).toEqual(buildURI(fakeHost, '1.0.0'));
     expect(convertDist.versions['1.0.1'].dist.tarball).toEqual(buildURI(fakeHost, '1.0.1'));
   });
@@ -43,7 +49,11 @@ describe('convertDistRemoteToLocalTarballUrls', () => {
       },
       url: '/',
     });
-    const convertDist = convertDistRemoteToLocalTarballUrls(cloneMetadata(), req);
+    const convertDist = convertDistRemoteToLocalTarballUrls(cloneMetadata(), {
+      host: req.hostname,
+      headers: req.headers as any,
+      protocol: req.protocol,
+    });
     expect(convertDist.versions['1.0.0'].dist.tarball).toEqual(
       convertDist.versions['1.0.0'].dist.tarball
     );
@@ -57,7 +67,11 @@ describe('convertDistRemoteToLocalTarballUrls', () => {
       },
       url: '/',
     });
-    const convertDist = convertDistRemoteToLocalTarballUrls(cloneMetadata(), req);
+    const convertDist = convertDistRemoteToLocalTarballUrls(cloneMetadata(), {
+      host: req.hostname,
+      headers: req.headers as any,
+      protocol: req.protocol,
+    });
     expect(convertDist.versions['1.0.0'].dist.tarball).toEqual(
       convertDist.versions['1.0.0'].dist.tarball
     );

package/tsconfig.json

@@ -11,10 +11,10 @@
       "path": "../../utils"
     },
     {
-      "path": "../commons-api"
+      "path": "../url"
     },
     {
-      "path": "../url"
+      "path": "../core"
     }
   ]
 }