fix(manager/npm): support modern pnpm overrides syntax

renovatebot · Oct 7, 2024 · 32dd0da · 32dd0da
1 parent 53e6622
commit 32dd0da
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/lib/modules/manager/npm/__fixtures__/inputs/02.json b/lib/modules/manager/npm/__fixtures__/inputs/02.json
@@ -13,6 +13,11 @@
     "@babel/core": "7.0.0",
     "config": "1.21.0"
   },
+  "pnpm": {
+    "overrides": {
+      "express>cookie": "0.7.0"
+    }
+  },
   "homepage": "https://keylocation.sg",
   "keywords": [
     "Key Location",

diff --git a/lib/modules/manager/npm/extract/common/package-file.ts b/lib/modules/manager/npm/extract/common/package-file.ts
@@ -84,19 +84,26 @@ export function extractPackageJson(
               ),
             );
           } else if (depType === 'pnpm' && depName === 'overrides') {
+            // pnpm overrides
+            // https://pnpm.io/package_json#pnpmoverrides
             for (const [overridesKey, overridesVal] of Object.entries(
               val as unknown as NpmPackageDependency,
             )) {
               if (is.string(overridesVal)) {
+                // Newer flat syntax: `parent>parent>child`
+                const packageName = overridesKey.split('>').pop()!;
                 dep = {
                   depName: overridesKey,
+                  packageName,
                   depType: 'pnpm.overrides',
-                  ...extractDependency(depName, overridesKey, overridesVal),
+                  ...extractDependency(depName, packageName, overridesVal),
                 };
                 setNodeCommitTopic(dep);
+                // TODO: Is this expected? It's always 'overrides'.
                 dep.prettyDepType = depTypes[depName];
                 deps.push(dep);
               } else if (is.object(overridesVal)) {
+                // Older nested object syntax: `parent: { parent: { child: version } }`
                 deps.push(
                   ...extractOverrideDepsRec(
                     [overridesKey],

diff --git a/lib/modules/manager/npm/extract/index.spec.ts b/lib/modules/manager/npm/extract/index.spec.ts
@@ -1052,6 +1052,14 @@ describe('modules/manager/npm/extract/index', () => {
               depType: 'dependencies',
               prettyDepType: 'dependency',
             },
+            {
+              currentValue: '0.7.0',
+              datasource: 'npm',
+              depName: 'express>cookie',
+              packageName: 'cookie',
+              depType: 'pnpm.overrides',
+              prettyDepType: 'overrides',
+            },
           ],
           extractedConstraints: {},
           managerData: {