From 1f6893f5e21f6976e1d2cede9be884bd2e732e53 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 27 Feb 2018 15:43:19 +0100
Subject: [PATCH] fix: npm config should only be merged for package.json
---
lib/manager/resolve.js | 3 +--
test/manager/__snapshots__/resolve.spec.js.snap | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/manager/resolve.js b/lib/manager/resolve.js
index fc06f9f39a..6b78f9d5cf 100644
--- a/lib/manager/resolve.js
+++ b/lib/manager/resolve.js
@@ -22,7 +22,6 @@ async function resolvePackageFiles(config) {
const fileList = await platform.getFileList();
async function resolvePackageFile(p) {
const packageFile = typeof p === 'string' ? { packageFile: p } : p;
- Object.assign(packageFile, config.npm);
if (packageFile.packageFile.endsWith('package.json')) {
logger.debug(`Resolving packageFile ${JSON.stringify(packageFile)}`);
const pFileRaw = await platform.getFile(packageFile.packageFile);
@@ -125,7 +124,7 @@ async function resolvePackageFiles(config) {
packageFile.shrinkwrapYaml = shrinkwrapFileName;
}
packageFile.currentPackageJsonVersion = packageFile.content.version;
- return packageFile;
+ return mergeChildConfig(config.npm, packageFile);
} else if (packageFile.packageFile.endsWith('package.js')) {
// meteor
return mergeChildConfig(config.meteor, packageFile);
diff --git a/test/manager/__snapshots__/resolve.spec.js.snap b/test/manager/__snapshots__/resolve.spec.js.snap
index 545da8d941..d509482f4d 100644
--- a/test/manager/__snapshots__/resolve.spec.js.snap
+++ b/test/manager/__snapshots__/resolve.spec.js.snap
@@ -268,7 +268,7 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
"branchName": "{{{branchPrefix}}}node-{{{depNameSanitized}}}",
"content": "hello: world
",
- "enabled": true,
+ "enabled": false,
"packageFile": ".travis.yml",
"prBody": "This Pull Request updates \`{{{depName}}}\` versions from \`{{{currentVersions}}}\` to \`{{{newVersions}}}\`. This is according to the configured node.js support policy \\"{{{supportPolicy}}}\\".
--
GitLab