Skip to content
Snippets Groups Projects
Commit 1f6893f5 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

fix: npm config should only be merged for package.json

parent 75ab3b14
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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}}}\\".
......
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