From 39a48c6e55c54504cce45fdae33afe699ae87df5 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Mon, 11 Dec 2017 19:43:49 +0100
Subject: [PATCH] fix: npm configs should be applied to all package.json files
(#1289)
---
lib/manager/resolve.js | 1 +
.../__snapshots__/resolve.spec.js.snap | 22 +++++++++++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/lib/manager/resolve.js b/lib/manager/resolve.js
index 8d87f95904..554e53cb1d 100644
--- a/lib/manager/resolve.js
+++ b/lib/manager/resolve.js
@@ -24,6 +24,7 @@ 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);
diff --git a/test/manager/__snapshots__/resolve.spec.js.snap b/test/manager/__snapshots__/resolve.spec.js.snap
index 881c90c316..087589e85c 100644
--- a/test/manager/__snapshots__/resolve.spec.js.snap
+++ b/test/manager/__snapshots__/resolve.spec.js.snap
@@ -960,9 +960,13 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
"content": Object {
"name": "package.json",
},
+ "enabled": true,
"npmrc": "npmrc",
"packageFile": "package.json",
"packageLock": "package-lock.json",
+ "pin": Object {
+ "automerge": true,
+ },
"yarnLock": "yarn.lock",
"yarnrc": "yarnrc",
},
@@ -1496,6 +1500,9 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
Object {
"enabled": true,
"packageFile": "package.js",
+ "pin": Object {
+ "automerge": true,
+ },
},
Object {
"branchName": "{{branchPrefix}}docker-{{depNameSanitized}}-{{newVersionMajor}}.x",
@@ -1592,6 +1599,7 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
"packageFile": "Dockerfile",
"pin": Object {
+ "automerge": true,
"branchName": "{{branchPrefix}}docker-pin-{{depNameSanitized}}-{{currentTag}}",
"group": Object {
"prBody": "This Pull Request pins Dockerfiles to use image digests. For details on Renovate's Docker support, please visit https://renovateapp.com/docs/language-support/docker
@@ -1715,8 +1723,11 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
"branchName": "{{branchPrefix}}node-{{depNameSanitized}}",
"content": "hello: world
",
- "enabled": false,
+ "enabled": true,
"packageFile": ".travis.yml",
+ "pin": Object {
+ "automerge": true,
+ },
"prBody": "This Pull Request updates {{depName}} versions from \`{{currentVersions}}\` to \`{{newVersions}}\`. This is according to the configured node.js support policy \\"{{supportPolicy}}\\".
{{#if schedule}}
@@ -1759,8 +1770,11 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
},
Object {
"content": "# travis",
- "enabled": false,
+ "enabled": true,
"packageFile": "WORKSPACE",
+ "pin": Object {
+ "automerge": true,
+ },
},
],
"packageNames": Array [],
@@ -2292,8 +2306,12 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
Object {
"automerge": true,
"content": Object {},
+ "enabled": true,
"errors": Array [],
"packageFile": "package.json",
+ "pin": Object {
+ "automerge": true,
+ },
"warnings": Array [],
},
],
--
GitLab