From d8667619d8c4a01ee50e441e3d8d2f083445cb4f Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 3 Jul 2018 13:51:59 +0200
Subject: [PATCH] fix(npm): move ignoreNpmrcFile logic out of mirror mode
Logic to automatically ignoreNpmrcFile=true when npmrc found was in the wrong location.
---
lib/workers/repository/init/config.js | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/workers/repository/init/config.js b/lib/workers/repository/init/config.js
index a2313a0baf..5205bb8644 100644
--- a/lib/workers/repository/init/config.js
+++ b/lib/workers/repository/init/config.js
@@ -22,12 +22,6 @@ async function mergeRenovateConfig(config) {
logger.debug({ renovateJson }, 'mirrorMode config');
const migratedConfig = await migrateAndValidate(config, renovateJson);
const resolvedConfig = await presets.resolveConfigPresets(migratedConfig);
- if (resolvedConfig.npmrc) {
- logger.debug(
- 'Ignoring any .npmrc files in repository due to configured npmrc'
- );
- resolvedConfig.ignoreNpmrcFile = true;
- }
returnConfig = mergeChildConfig(returnConfig, resolvedConfig);
returnConfig.renovateJsonPresent = true;
return returnConfig;
@@ -139,6 +133,13 @@ async function mergeRenovateConfig(config) {
);
delete resolvedConfig.privateKey;
logger.trace({ config: resolvedConfig }, 'resolved config');
+ // istanbul ignore if
+ if (resolvedConfig.npmrc) {
+ logger.debug(
+ 'Ignoring any .npmrc files in repository due to configured npmrc'
+ );
+ resolvedConfig.ignoreNpmrcFile = true;
+ }
returnConfig = mergeChildConfig(returnConfig, resolvedConfig);
returnConfig.renovateJsonPresent = true;
returnConfig.packageRules = flattenPackageRules(returnConfig.packageRules);
--
GitLab