From 625e36ec5b444728ba376afb1fed35e15527cb17 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Thu, 17 May 2018 15:22:01 -0700 Subject: [PATCH] Get registryURL from server config --- server/config.js | 3 +++ server/middleware/utils/getPackage.js | 1 + server/middleware/utils/getPackageInfo.js | 7 +++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/config.js b/server/config.js index f20c6b2..d7c3803 100644 --- a/server/config.js +++ b/server/config.js @@ -4,3 +4,6 @@ exports.origin = process.env.NODE_ENV === "production" || process.env.NODE_ENV === "test" ? "https://unpkg.com" : `http://localhost:${exports.port}`; + +exports.registryURL = + process.env.NPM_REGISTRY_URL || "https://registry.npmjs.org"; diff --git a/server/middleware/utils/getPackage.js b/server/middleware/utils/getPackage.js index a6e6d09..2e9ad40 100644 --- a/server/middleware/utils/getPackage.js +++ b/server/middleware/utils/getPackage.js @@ -5,6 +5,7 @@ const tmpdir = require("os-tmpdir"); const gunzip = require("gunzip-maybe"); const mkdirp = require("mkdirp"); const tar = require("tar-fs"); + const createMutex = require("./createMutex"); function createTempPath(name, version) { diff --git a/server/middleware/utils/getPackageInfo.js b/server/middleware/utils/getPackageInfo.js index a595568..ed34847 100644 --- a/server/middleware/utils/getPackageInfo.js +++ b/server/middleware/utils/getPackageInfo.js @@ -1,11 +1,10 @@ require("isomorphic-fetch"); +const config = require("../../config"); + const createCache = require("./createCache"); const createMutex = require("./createMutex"); -const registryURL = - process.env.NPM_REGISTRY_URL || "https://registry.npmjs.org"; - const packageInfoCache = createCache("packageInfo"); function fetchPackageInfo(packageName) { @@ -18,7 +17,7 @@ function fetchPackageInfo(packageName) { encodedPackageName = encodeURIComponent(packageName); } - const url = `${registryURL}/${encodedPackageName}`; + const url = `${config.registryURL}/${encodedPackageName}`; return fetch(url, { headers: {