feat(npm)!: separate npm, pnpm, yarn managers

lib/config/index.spec.ts

@@ -97,6 +97,13 @@ describe('config/index', () => {
       ]);
     });
 
+    it('falls back from yarn to npm', () => {
+      const parentConfig = { ...defaultConfig };
+      expect(getManagerConfig(parentConfig, 'yarn').fileMatch).toEqual([
+        '(^|/)yarn\\.lock$',
+      ]);
+    });
+
     it('filterConfig()', () => {
       const parentConfig = { ...defaultConfig };
       const config = filterConfig(parentConfig, 'pr');

lib/config/index.ts

@@ -24,6 +24,14 @@ export function getManagerConfig(
     managerConfig.categories = categories;
   }
   // TODO: fix types #22198
+  // Special handling for npm, pnpm, yarn
+  const alternativeNpmManagers = ['pnpm', 'yarn'];
+  if (alternativeNpmManagers.includes(manager)) {
+    // merge npm config first
+    managerConfig = mergeChildConfig(managerConfig, config.npm as any);
+    // We don't want to merge fileMatch
+    delete managerConfig.fileMatch;
+  }
   managerConfig = mergeChildConfig(managerConfig, config[manager] as any);
   for (const i of allManagersList) {
     delete managerConfig[i];

lib/modules/manager/api.ts

@@ -65,6 +65,7 @@ import * as pipCompile from './pip-compile';
 import * as pip_requirements from './pip_requirements';
 import * as pip_setup from './pip_setup';
 import * as pipenv from './pipenv';
+import * as pnpm from './pnpm';
 import * as poetry from './poetry';
 import * as preCommit from './pre-commit';
 import * as pub from './pub';
@@ -84,6 +85,7 @@ import * as travis from './travis';
 import type { ManagerApi } from './types';
 import * as velaci from './velaci';
 import * as woodpecker from './woodpecker';
+import * as yarn from './yarn';
 
 const api = new Map<string, ManagerApi>();
 export default api;
@@ -155,6 +157,7 @@ api.set('pip-compile', pipCompile);
 api.set('pip_requirements', pip_requirements);
 api.set('pip_setup', pip_setup);
 api.set('pipenv', pipenv);
+api.set('pnpm', pnpm);
 api.set('poetry', poetry);
 api.set('pre-commit', preCommit);
 api.set('pub', pub);
@@ -173,3 +176,4 @@ api.set('tflint-plugin', tflintPlugin);
 api.set('travis', travis);
 api.set('velaci', velaci);
 api.set('woodpecker', woodpecker);
+api.set('yarn', yarn);

lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap

@@ -15,10 +15,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() catches invalid
     "hasPackageManager": false,
     "npmLock": undefined,
     "packageJsonName": undefined,
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": undefined,
@@ -128,16 +126,13 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts engine
     "npm": "^8.0.0",
     "pnpm": "^1.2.0",
     "vscode": ">=1.49.3",
-    "yarn": "disabled",
   },
   "managerData": {
     "hasPackageManager": false,
     "npmLock": undefined,
     "packageJsonName": undefined,
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": undefined,
@@ -311,10 +306,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts non-np
     "hasPackageManager": false,
     "npmLock": undefined,
     "packageJsonName": undefined,
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": undefined,
@@ -357,10 +350,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts npm pa
     "hasPackageManager": false,
     "npmLock": "package-lock.json",
     "packageJsonName": undefined,
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": undefined,
@@ -388,10 +379,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts packag
     "hasPackageManager": true,
     "npmLock": undefined,
     "packageJsonName": undefined,
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": undefined,
@@ -455,15 +444,16 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
   ],
   "extractedConstraints": {
     "node": "8.9.2",
+    "npm": "5.9.0",
+    "pnpm": "6.11.2",
+    "yarn": "1.12.3",
   },
   "managerData": {
     "hasPackageManager": false,
     "npmLock": undefined,
     "packageJsonName": undefined,
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": undefined,
@@ -511,10 +501,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
     "hasPackageManager": false,
     "npmLock": undefined,
     "packageJsonName": undefined,
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": undefined,
@@ -642,12 +630,10 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds a lock fi
   "extractedConstraints": {},
   "managerData": {
     "hasPackageManager": false,
-    "npmLock": undefined,
+    "npmLock": "package-lock.json",
     "packageJsonName": "renovate",
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": "yarn.lock",
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": "1.0.0",
@@ -777,10 +763,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() returns an arra
     "hasPackageManager": false,
     "npmLock": undefined,
     "packageJsonName": "renovate",
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": "1.0.0",
@@ -892,10 +876,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() returns an arra
     "hasPackageManager": false,
     "npmLock": undefined,
     "packageJsonName": "renovate",
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": [],
-    "yarnLock": undefined,
-    "yarnZeroInstall": false,
   },
   "npmrc": undefined,
   "packageFileVersion": "1.0.0",
@@ -1025,13 +1007,11 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() sets skipInstal
     "hasPackageManager": false,
     "npmLock": undefined,
     "packageJsonName": "renovate",
-    "pnpmShrinkwrap": undefined,
+    "shrinkwrapJson": undefined,
     "workspacesPackages": undefined,
-    "yarnLock": "yarn.lock",
-    "yarnZeroInstall": true,
   },
   "npmrc": undefined,
   "packageFileVersion": "1.0.0",
-  "skipInstalls": false,
+  "skipInstalls": true,
 }
 `;