Skip to content
Snippets Groups Projects
Unverified Commit 39a48c6e authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix: npm configs should be applied to all package.json files (#1289)

parent cb8fd6b4
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,7 @@ async function resolvePackageFiles(config) { ...@@ -24,6 +24,7 @@ async function resolvePackageFiles(config) {
const fileList = await platform.getFileList(); const fileList = await platform.getFileList();
async function resolvePackageFile(p) { async function resolvePackageFile(p) {
const packageFile = typeof p === 'string' ? { packageFile: p } : p; const packageFile = typeof p === 'string' ? { packageFile: p } : p;
Object.assign(packageFile, config.npm);
if (packageFile.packageFile.endsWith('package.json')) { if (packageFile.packageFile.endsWith('package.json')) {
logger.debug(`Resolving packageFile ${JSON.stringify(packageFile)}`); logger.debug(`Resolving packageFile ${JSON.stringify(packageFile)}`);
const pFileRaw = await platform.getFile(packageFile.packageFile); const pFileRaw = await platform.getFile(packageFile.packageFile);
......
...@@ -960,9 +960,13 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", ...@@ -960,9 +960,13 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
"content": Object { "content": Object {
"name": "package.json", "name": "package.json",
}, },
"enabled": true,
"npmrc": "npmrc", "npmrc": "npmrc",
"packageFile": "package.json", "packageFile": "package.json",
"packageLock": "package-lock.json", "packageLock": "package-lock.json",
"pin": Object {
"automerge": true,
},
"yarnLock": "yarn.lock", "yarnLock": "yarn.lock",
"yarnrc": "yarnrc", "yarnrc": "yarnrc",
}, },
...@@ -1496,6 +1500,9 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", ...@@ -1496,6 +1500,9 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
Object { Object {
"enabled": true, "enabled": true,
"packageFile": "package.js", "packageFile": "package.js",
"pin": Object {
"automerge": true,
},
}, },
Object { Object {
"branchName": "{{branchPrefix}}docker-{{depNameSanitized}}-{{newVersionMajor}}.x", "branchName": "{{branchPrefix}}docker-{{depNameSanitized}}-{{newVersionMajor}}.x",
...@@ -1592,6 +1599,7 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", ...@@ -1592,6 +1599,7 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
}, },
"packageFile": "Dockerfile", "packageFile": "Dockerfile",
"pin": Object { "pin": Object {
"automerge": true,
"branchName": "{{branchPrefix}}docker-pin-{{depNameSanitized}}-{{currentTag}}", "branchName": "{{branchPrefix}}docker-pin-{{depNameSanitized}}-{{currentTag}}",
"group": Object { "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 "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).", ...@@ -1715,8 +1723,11 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
"branchName": "{{branchPrefix}}node-{{depNameSanitized}}", "branchName": "{{branchPrefix}}node-{{depNameSanitized}}",
"content": "hello: world "content": "hello: world
", ",
"enabled": false, "enabled": true,
"packageFile": ".travis.yml", "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}}\\". "prBody": "This Pull Request updates {{depName}} versions from \`{{currentVersions}}\` to \`{{newVersions}}\`. This is according to the configured node.js support policy \\"{{supportPolicy}}\\".
{{#if schedule}} {{#if schedule}}
...@@ -1759,8 +1770,11 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", ...@@ -1759,8 +1770,11 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
}, },
Object { Object {
"content": "# travis", "content": "# travis",
"enabled": false, "enabled": true,
"packageFile": "WORKSPACE", "packageFile": "WORKSPACE",
"pin": Object {
"automerge": true,
},
}, },
], ],
"packageNames": Array [], "packageNames": Array [],
...@@ -2292,8 +2306,12 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", ...@@ -2292,8 +2306,12 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).",
Object { Object {
"automerge": true, "automerge": true,
"content": Object {}, "content": Object {},
"enabled": true,
"errors": Array [], "errors": Array [],
"packageFile": "package.json", "packageFile": "package.json",
"pin": Object {
"automerge": true,
},
"warnings": Array [], "warnings": Array [],
}, },
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment