From dd8c39ab62ec0790a420eb530e5b888c7c2f53bf Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sat, 27 Mar 2021 07:26:49 +0100
Subject: [PATCH] =?UTF-8?q?fix(npm):=20don=E2=80=99t=20strip=20every=20npm?=
=?UTF-8?q?rc=20line=20containing=20variables?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/manager/npm/extract/index.spec.ts | 2 +-
lib/manager/npm/extract/index.ts | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/manager/npm/extract/index.spec.ts b/lib/manager/npm/extract/index.spec.ts
index a61147a193..8a4f2cc684 100644
--- a/lib/manager/npm/extract/index.spec.ts
+++ b/lib/manager/npm/extract/index.spec.ts
@@ -125,7 +125,7 @@ describe('manager/npm/extract', () => {
'package.json',
{}
);
- expect(res.npmrc).toBeUndefined();
+ expect(res.npmrc).toEqual('');
});
it('finds lerna', async () => {
fs.readLocalFile = jest.fn((fileName) => {
diff --git a/lib/manager/npm/extract/index.ts b/lib/manager/npm/extract/index.ts
index 864d347acd..6bcf65e0df 100644
--- a/lib/manager/npm/extract/index.ts
+++ b/lib/manager/npm/extract/index.ts
@@ -111,10 +111,14 @@ export async function extractPackageFile(
npmrc = npmrc.replace(/(^|\n)package-lock.*?(\n|$)/g, '\n');
}
if (npmrc.includes('=${') && getAdminConfig().trustLevel !== 'high') {
- logger.debug('Discarding .npmrc file with variables');
- ignoreNpmrcFile = true;
- npmrc = undefined;
- await deleteLocalFile(npmrcFileName);
+ logger.debug(
+ { npmrcFileName },
+ 'Discarding .npmrc lines with variables'
+ );
+ npmrc = npmrc
+ .split('\n')
+ .filter((line) => !line.includes('=${'))
+ .join('\n');
}
} else {
npmrc = undefined;
--
GitLab