From ebe9607d79c22bf9a753675d512d46f451707dfa Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Sun, 13 May 2018 22:04:06 +0200
Subject: [PATCH] fix(npm): npmrc/ignoreNpmrc logic
---
lib/manager/npm/post-update/index.js | 9 +++------
lib/workers/repository/init/config.js | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/manager/npm/post-update/index.js b/lib/manager/npm/post-update/index.js
index 0700d2aba1..1594cd5855 100644
--- a/lib/manager/npm/post-update/index.js
+++ b/lib/manager/npm/post-update/index.js
@@ -170,15 +170,12 @@ async function writeExistingFiles(config, packageFiles) {
}
}
let { npmrc } = config;
- if (!config.ignoreNpmrc) {
+ if (packageFile.npmrc && !config.ignoreNpmrc) {
+ logger.debug('Using package.json .npmrc');
npmrc = npmrc || packageFile.npmrc;
}
if (npmrc) {
- if (npmrc.includes('=${' && !config.global.exposeEnv)) {
- logger.info('Skipping .npmrc as it contains variables');
- } else {
- await fs.outputFile(upath.join(basedir, '.npmrc'), npmrc);
- }
+ await fs.outputFile(upath.join(basedir, '.npmrc'), npmrc);
}
if (packageFile.yarnrc) {
logger.debug(`Writing .yarnrc to ${basedir}`);
diff --git a/lib/workers/repository/init/config.js b/lib/workers/repository/init/config.js
index 839ae0a1b5..432a392992 100644
--- a/lib/workers/repository/init/config.js
+++ b/lib/workers/repository/init/config.js
@@ -21,7 +21,7 @@ async function mergeRenovateConfig(config) {
logger.debug({ renovateJson }, 'mirrorMode config');
const migratedConfig = await migrateAndValidate(config, renovateJson);
const resolvedConfig = await presets.resolveConfigPresets(migratedConfig);
- if (resolvedConfig.npmrc && resolvedConfig.ignoreNpmrc !== false) {
+ if (resolvedConfig.npmrc) {
resolvedConfig.ignoreNpmrc = true;
}
returnConfig = mergeChildConfig(returnConfig, resolvedConfig);
--
GitLab