diff --git a/lib/config/definitions.js b/lib/config/definitions.js index 408f15647574633066d0c8e629fb9e8c187c6dc5..677aeda4c380f29af0935143e91659907b55310f 100644 --- a/lib/config/definitions.js +++ b/lib/config/definitions.js @@ -330,7 +330,6 @@ const options = [ { name: 'ignoreNpmrcFile', description: 'Whether to ignore any .npmrc file found in repository', - stage: 'package', type: 'boolean', default: false, }, diff --git a/lib/manager/npm/extract/index.js b/lib/manager/npm/extract/index.js index 97a69d3712686d69901f6396ce82bc4562477511..8c0b791c24fd29af6175bfc510b3a17df56b3163 100644 --- a/lib/manager/npm/extract/index.js +++ b/lib/manager/npm/extract/index.js @@ -93,6 +93,7 @@ async function extractPackageFile(content, fileName, config) { delete lockFiles.shrinkwrapJson; let npmrc; + let ignoreNpmrcFile; const npmrcFileName = upath.join(path.dirname(fileName), '.npmrc'); const npmrcFileNameLocal = upath.join(config.localDir || '', npmrcFileName); // istanbul ignore if @@ -107,6 +108,7 @@ async function extractPackageFile(content, fileName, config) { if (npmrc) { if (npmrc.includes('=${') && !(global.trustLevel === 'high')) { logger.info('Discarding .npmrc file with variables'); + ignoreNpmrcFile = true; npmrc = undefined; await fs.remove(npmrcFileNameLocal); } @@ -304,6 +306,7 @@ async function extractPackageFile(content, fileName, config) { packageJsonVersion, packageJsonType, npmrc, + ignoreNpmrcFile, yarnrc, ...lockFiles, lernaDir, diff --git a/test/manager/npm/extract/__snapshots__/index.spec.js.snap b/test/manager/npm/extract/__snapshots__/index.spec.js.snap index 1161e93147e8aa3a853ebf3d175326c03de61628..d9363361c9ce12d01369285ae1a5f89410d4b2b0 100644 --- a/test/manager/npm/extract/__snapshots__/index.spec.js.snap +++ b/test/manager/npm/extract/__snapshots__/index.spec.js.snap @@ -10,6 +10,7 @@ Object { "skipReason": "invalid-name", }, ], + "ignoreNpmrcFile": undefined, "lernaClient": undefined, "lernaDir": undefined, "lernaPackages": undefined, @@ -111,6 +112,7 @@ Object { "skipReason": "unknown-version", }, ], + "ignoreNpmrcFile": undefined, "lernaClient": undefined, "lernaDir": undefined, "lernaPackages": undefined, @@ -271,6 +273,7 @@ Object { "sourceUrl": "https://github.com/owner/n", }, ], + "ignoreNpmrcFile": undefined, "lernaClient": undefined, "lernaDir": undefined, "lernaPackages": undefined, @@ -317,6 +320,7 @@ Object { "skipReason": "unknown-version", }, ], + "ignoreNpmrcFile": undefined, "lernaClient": undefined, "lernaDir": undefined, "lernaPackages": undefined, @@ -413,6 +417,7 @@ Object { "prettyDepType": "devDependency", }, ], + "ignoreNpmrcFile": undefined, "lernaClient": undefined, "lernaDir": undefined, "lernaPackages": undefined, @@ -432,6 +437,7 @@ Object { exports[`manager/npm/extract .extractPackageFile() finds complex yarn workspaces 1`] = ` Object { "deps": Array [], + "ignoreNpmrcFile": undefined, "lernaClient": "npm", "lernaDir": ".", "lernaPackages": undefined, @@ -530,6 +536,7 @@ Object { "prettyDepType": "devDependency", }, ], + "ignoreNpmrcFile": undefined, "lernaClient": "npm", "lernaDir": ".", "lernaPackages": undefined, @@ -626,6 +633,7 @@ Object { "prettyDepType": "devDependency", }, ], + "ignoreNpmrcFile": undefined, "lernaClient": undefined, "lernaDir": undefined, "lernaPackages": undefined, diff --git a/test/workers/repository/extract/__snapshots__/manager-files.spec.js.snap b/test/workers/repository/extract/__snapshots__/manager-files.spec.js.snap index cdbb753073e6c7f54957f41732f9de37d8e54e94..5e1c2214fcc5f91d2281b7e0dcae2badd9f73786 100644 --- a/test/workers/repository/extract/__snapshots__/manager-files.spec.js.snap +++ b/test/workers/repository/extract/__snapshots__/manager-files.spec.js.snap @@ -4,6 +4,7 @@ exports[`workers/repository/extract/manager-files getManagerPackageFiles() retur Array [ Object { "deps": Array [], + "ignoreNpmrcFile": undefined, "lernaClient": "npm", "lernaDir": ".", "lernaPackages": undefined, diff --git a/test/workers/repository/updates/__snapshots__/flatten.spec.js.snap b/test/workers/repository/updates/__snapshots__/flatten.spec.js.snap index 5b865cbab7607a378722c79f55f0494a6f80cb10..d624995ea4fb7e5ed87eba96d3b2095e33db4afd 100644 --- a/test/workers/repository/updates/__snapshots__/flatten.spec.js.snap +++ b/test/workers/repository/updates/__snapshots__/flatten.spec.js.snap @@ -39,6 +39,7 @@ Array [ }, "groupName": null, "groupSlug": null, + "ignoreNpmrcFile": false, "labels": Array [], "language": "js", "lazyGrouping": true, @@ -149,6 +150,7 @@ Array [ }, "groupName": null, "groupSlug": null, + "ignoreNpmrcFile": false, "labels": Array [], "language": "js", "lazyGrouping": true, @@ -257,6 +259,7 @@ Array [ }, "groupName": null, "groupSlug": null, + "ignoreNpmrcFile": false, "labels": Array [], "language": "js", "lazyGrouping": true, @@ -369,6 +372,7 @@ Array [ }, "groupName": null, "groupSlug": null, + "ignoreNpmrcFile": false, "labels": Array [], "language": "js", "lazyGrouping": true, @@ -477,6 +481,7 @@ Array [ }, "groupName": null, "groupSlug": null, + "ignoreNpmrcFile": false, "labels": Array [], "language": "js", "lazyGrouping": true, @@ -589,6 +594,7 @@ Array [ }, "groupName": null, "groupSlug": null, + "ignoreNpmrcFile": false, "labels": Array [], "language": "js", "lazyGrouping": true, @@ -699,6 +705,7 @@ Array [ }, "groupName": null, "groupSlug": null, + "ignoreNpmrcFile": false, "labels": Array [], "language": "docker", "lazyGrouping": true, @@ -809,6 +816,7 @@ Array [ }, "groupName": null, "groupSlug": null, + "ignoreNpmrcFile": false, "labels": Array [], "language": "docker", "lazyGrouping": true,