diff --git a/lib/manager/npm/monorepos.js b/lib/manager/npm/monorepos.js index f20f52f7b23e1ada33605cf3e2734ccd19ca5d9b..1d44cf3cad102b517a4cb46e70ba940f9b8fd92c 100644 --- a/lib/manager/npm/monorepos.js +++ b/lib/manager/npm/monorepos.js @@ -52,9 +52,10 @@ async function checkMonorepos(config) { if (!monorepoPackages.includes(depName)) { monorepoPackages.push(depName); } + packageFile.lerna = true; } } } } - return { ...config, monorepoPackages, workspaceDir }; + return { ...config, monorepoPackages }; } diff --git a/lib/workers/dep-type/index.js b/lib/workers/dep-type/index.js index 6707d3d852cbca7670be6e0688df6bd668035bd0..bfaab69d76b6cb59287aa825a2fe2dacd4ca5b44 100644 --- a/lib/workers/dep-type/index.js +++ b/lib/workers/dep-type/index.js @@ -27,9 +27,11 @@ async function renovateDepType(packageContent, config) { packageContent, config.depType ); - deps = deps.filter( - dependency => config.monorepoPackages.indexOf(dependency.depName) === -1 - ); + if (config.lerna || config.workspaceDir) { + deps = deps.filter( + dependency => config.monorepoPackages.indexOf(dependency.depName) === -1 + ); + } logger.debug(`deps length is ${deps.length}`); logger.debug({ deps }, `deps`); } else if (config.packageFile.endsWith('package.js')) { diff --git a/test/manager/__snapshots__/resolve.spec.js.snap b/test/manager/__snapshots__/resolve.spec.js.snap index 0c17b40897e4a6a089ff91eaccb31cb8af07e6cb..876e0c8a1fb136b451d549079a24253ba7846864 100644 --- a/test/manager/__snapshots__/resolve.spec.js.snap +++ b/test/manager/__snapshots__/resolve.spec.js.snap @@ -485,7 +485,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", "message": "Cannot parse package.json (invalid JSON)", }, ], - "workspaceDir": undefined, "yarnrc": null, } `; @@ -1189,7 +1188,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", "unstablePattern": null, "updateNotScheduled": true, "warnings": Array [], - "workspaceDir": undefined, "yarnrc": null, } `; @@ -1684,7 +1682,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", "unstablePattern": null, "updateNotScheduled": true, "warnings": Array [], - "workspaceDir": undefined, "yarnrc": null, } `; @@ -2180,7 +2177,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", "unstablePattern": null, "updateNotScheduled": true, "warnings": Array [], - "workspaceDir": undefined, "yarnrc": null, } `; @@ -2665,7 +2661,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", "unstablePattern": null, "updateNotScheduled": true, "warnings": Array [], - "workspaceDir": undefined, "yarnrc": null, } `; @@ -3159,7 +3154,6 @@ This PR has been generated by [Renovate Bot](https://renovateapp.com).", "unstablePattern": null, "updateNotScheduled": true, "warnings": Array [], - "workspaceDir": undefined, "yarnrc": null, } `; diff --git a/test/workers/dep-type/index.spec.js b/test/workers/dep-type/index.spec.js index 1cfda35ebd85ad387f787413f934a87d258214d3..8bbd571dfaf28868d4088810987710d3ac059ff8 100644 --- a/test/workers/dep-type/index.spec.js +++ b/test/workers/dep-type/index.spec.js @@ -17,6 +17,7 @@ describe('lib/workers/dep-type/index', () => { packageFile: 'package.json', ignoreDeps: ['a', 'b'], monorepoPackages: ['e'], + workspaceDir: '.', }; }); it('returns empty if config is disabled', async () => {