feat(node): use node-version datasource (#26918)

renovatebot · Jan 29, 2024 · 8c9167e · 8c9167e
1 parent 7780a02
commit 8c9167e
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 81 deletions.
diff --git a/lib/modules/manager/nodenv/extract.spec.ts b/lib/modules/manager/nodenv/extract.spec.ts
@@ -7,9 +7,8 @@ describe('modules/manager/nodenv/extract', () => {
       expect(res.deps).toEqual([
         {
           currentValue: '8.4.0',
-          datasource: 'github-tags',
+          datasource: 'node-version',
           depName: 'node',
-          packageName: 'nodejs/node',
         },
       ]);
     });
@@ -19,9 +18,8 @@ describe('modules/manager/nodenv/extract', () => {
       expect(res.deps).toEqual([
         {
           currentValue: '8.4',
-          datasource: 'github-tags',
+          datasource: 'node-version',
           depName: 'node',
-          packageName: 'nodejs/node',
         },
       ]);
     });
@@ -31,9 +29,8 @@ describe('modules/manager/nodenv/extract', () => {
       expect(res.deps).toEqual([
         {
           currentValue: 'latestn',
-          datasource: 'github-tags',
+          datasource: 'node-version',
           depName: 'node',
-          packageName: 'nodejs/node',
         },
       ]);
     });

diff --git a/lib/modules/manager/nodenv/extract.ts b/lib/modules/manager/nodenv/extract.ts
@@ -1,12 +1,11 @@
-import { GithubTagsDatasource } from '../../datasource/github-tags';
+import { NodeVersionDatasource } from '../../datasource/node-version';
 import type { PackageDependency, PackageFileContent } from '../types';
 
 export function extractPackageFile(content: string): PackageFileContent {
   const dep: PackageDependency = {
     depName: 'node',
     currentValue: content.trim(),
-    datasource: GithubTagsDatasource.id,
-    packageName: 'nodejs/node',
+    datasource: NodeVersionDatasource.id,
   };
   return { deps: [dep] };
 }
diff --git a/lib/modules/manager/nodenv/index.ts b/lib/modules/manager/nodenv/index.ts
@@ -1,5 +1,5 @@
 import type { Category } from '../../../constants';
-import { GithubTagsDatasource } from '../../datasource/github-tags';
+import { NodeVersionDatasource } from '../../datasource/node-version';
 import * as nodeVersioning from '../../versioning/node';
 
 export { extractPackageFile } from './extract';
@@ -14,4 +14,4 @@ export const defaultConfig = {
 
 export const categories: Category[] = ['js', 'node'];
 
-export const supportedDatasources = [GithubTagsDatasource.id];
+export const supportedDatasources = [NodeVersionDatasource.id];
diff --git a/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap b/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap
@@ -82,12 +82,10 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts engine
     {
       "commitMessageTopic": "Node.js",
       "currentValue": ">= 8.9.2",
-      "datasource": "github-tags",
+      "datasource": "node-version",
       "depName": "node",
       "depType": "engines",
-      "packageName": "nodejs/node",
       "prettyDepType": "engine",
-      "versioning": "node",
     },
     {
       "commitMessageTopic": "npm",
@@ -440,22 +438,18 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
     {
       "commitMessageTopic": "Node.js",
       "currentValue": "8.9.2",
-      "datasource": "github-tags",
+      "datasource": "node-version",
       "depName": "node",
       "depType": "engines",
-      "packageName": "nodejs/node",
       "prettyDepType": "engine",
-      "versioning": "node",
     },
     {
       "commitMessageTopic": "Node.js",
       "currentValue": "8.9.2",
-      "datasource": "github-tags",
+      "datasource": "node-version",
       "depName": "node",
       "depType": "volta",
-      "packageName": "nodejs/node",
       "prettyDepType": "volta",
-      "versioning": "node",
     },
     {
       "commitMessageTopic": "Yarn",
@@ -512,22 +506,18 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
     {
       "commitMessageTopic": "Node.js",
       "currentValue": "8.9.2",
-      "datasource": "github-tags",
+      "datasource": "node-version",
       "depName": "node",
       "depType": "engines",
-      "packageName": "nodejs/node",
       "prettyDepType": "engine",
-      "versioning": "node",
     },
     {
       "commitMessageTopic": "Node.js",
       "currentValue": "8.9.2",
-      "datasource": "github-tags",
+      "datasource": "node-version",
       "depName": "node",
       "depType": "volta",
-      "packageName": "nodejs/node",
       "prettyDepType": "volta",
-      "versioning": "node",
     },
     {
       "commitMessageTopic": "Yarn",

diff --git a/lib/modules/manager/npm/extract/common/dependency.ts b/lib/modules/manager/npm/extract/common/dependency.ts
@@ -3,8 +3,8 @@ import validateNpmPackageName from 'validate-npm-package-name';
 import { logger } from '../../../../../logger';
 import { regEx } from '../../../../../util/regex';
 import { GithubTagsDatasource } from '../../../../datasource/github-tags';
+import { NodeVersionDatasource } from '../../../../datasource/node-version';
 import { NpmDatasource } from '../../../../datasource/npm';
-import * as nodeVersioning from '../../../../versioning/node';
 import { api, isValid, isVersion } from '../../../../versioning/npm';
 import type { PackageDependency } from '../../../types';
 
@@ -38,9 +38,7 @@ export function extractDependency(
   dep.currentValue = input.trim();
   if (depType === 'engines' || depType === 'packageManager') {
     if (depName === 'node') {
-      dep.datasource = GithubTagsDatasource.id;
-      dep.packageName = 'nodejs/node';
-      dep.versioning = nodeVersioning.id;
+      dep.datasource = NodeVersionDatasource.id;
     } else if (depName === 'yarn') {
       dep.datasource = NpmDatasource.id;
       dep.commitMessageTopic = 'Yarn';
@@ -70,9 +68,7 @@ export function extractDependency(
   // support for volta
   if (depType === 'volta') {
     if (depName === 'node') {
-      dep.datasource = GithubTagsDatasource.id;
-      dep.packageName = 'nodejs/node';
-      dep.versioning = nodeVersioning.id;
+      dep.datasource = NodeVersionDatasource.id;
     } else if (depName === 'yarn') {
       dep.datasource = NpmDatasource.id;
       dep.commitMessageTopic = 'Yarn';

diff --git a/lib/modules/manager/npm/extract/index.spec.ts b/lib/modules/manager/npm/extract/index.spec.ts
@@ -366,8 +366,7 @@ describe('modules/manager/npm/extract/index', () => {
           {
             depName: 'node',
             currentValue: '>= 8.9.2',
-            datasource: 'github-tags',
-            versioning: 'node',
+            datasource: 'node-version',
             depType: 'engines',
           },
           {
@@ -462,12 +461,10 @@ describe('modules/manager/npm/extract/index', () => {
           {
             commitMessageTopic: 'Node.js',
             currentValue: '8.9.2',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
             depType: 'volta',
-            packageName: 'nodejs/node',
             prettyDepType: 'volta',
-            versioning: 'node',
           },
           {
             commitMessageTopic: 'Yarn',
@@ -506,12 +503,10 @@ describe('modules/manager/npm/extract/index', () => {
           {
             commitMessageTopic: 'Node.js',
             currentValue: '16.0.0',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
             depType: 'volta',
-            packageName: 'nodejs/node',
             prettyDepType: 'volta',
-            versioning: 'node',
           },
           {
             commitMessageTopic: 'Yarn',
@@ -683,12 +678,10 @@ describe('modules/manager/npm/extract/index', () => {
           {
             commitMessageTopic: 'Node.js',
             currentValue: '8.9.2',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
             depType: 'engines',
-            packageName: 'nodejs/node',
             prettyDepType: 'engine',
-            versioning: 'node',
           },
           {
             commitMessageTopic: 'Yarn',

diff --git a/lib/modules/manager/npm/index.ts b/lib/modules/manager/npm/index.ts
@@ -1,5 +1,6 @@
 import type { Category } from '../../../constants';
 import { GithubTagsDatasource } from '../../datasource/github-tags';
+import { NodeVersionDatasource } from '../../datasource/node-version';
 import { NpmDatasource } from '../../datasource/npm';
 import * as npmVersioning from '../../versioning/npm';
 
@@ -31,4 +32,8 @@ export const defaultConfig = {
 
 export const categories: Category[] = ['js'];
 
-export const supportedDatasources = [GithubTagsDatasource.id, NpmDatasource.id];
+export const supportedDatasources = [
+  GithubTagsDatasource.id,
+  NpmDatasource.id,
+  NodeVersionDatasource.id,
+];
diff --git a/lib/modules/manager/nvm/extract.spec.ts b/lib/modules/manager/nvm/extract.spec.ts
@@ -7,9 +7,8 @@ describe('modules/manager/nvm/extract', () => {
       expect(res.deps).toEqual([
         {
           currentValue: '8.4.0',
-          datasource: 'github-tags',
+          datasource: 'node-version',
           depName: 'node',
-          packageName: 'nodejs/node',
         },
       ]);
     });
@@ -19,9 +18,8 @@ describe('modules/manager/nvm/extract', () => {
       expect(res.deps).toEqual([
         {
           currentValue: '8.4',
-          datasource: 'github-tags',
+          datasource: 'node-version',
           depName: 'node',
-          packageName: 'nodejs/node',
         },
       ]);
     });
@@ -31,9 +29,8 @@ describe('modules/manager/nvm/extract', () => {
       expect(res.deps).toEqual([
         {
           currentValue: 'latestn',
-          datasource: 'github-tags',
+          datasource: 'node-version',
           depName: 'node',
-          packageName: 'nodejs/node',
         },
       ]);
     });

diff --git a/lib/modules/manager/nvm/extract.ts b/lib/modules/manager/nvm/extract.ts
@@ -1,12 +1,11 @@
-import { GithubTagsDatasource } from '../../datasource/github-tags';
+import { NodeVersionDatasource } from '../../datasource/node-version';
 import type { PackageDependency, PackageFileContent } from '../types';
 
 export function extractPackageFile(content: string): PackageFileContent {
   const dep: PackageDependency = {
     depName: 'node',
     currentValue: content.trim(),
-    datasource: GithubTagsDatasource.id,
-    packageName: 'nodejs/node',
+    datasource: NodeVersionDatasource.id,
   };
   return { deps: [dep] };
 }
diff --git a/lib/modules/manager/nvm/index.ts b/lib/modules/manager/nvm/index.ts
@@ -1,5 +1,5 @@
 import type { Category } from '../../../constants';
-import { GithubTagsDatasource } from '../../datasource/github-tags';
+import { NodeVersionDatasource } from '../../datasource/node-version';
 import * as nodeVersioning from '../../versioning/node';
 
 export { extractPackageFile } from './extract';
@@ -15,4 +15,4 @@ export const defaultConfig = {
 
 export const categories: Category[] = ['js', 'node'];
 
-export const supportedDatasources = [GithubTagsDatasource.id];
+export const supportedDatasources = [NodeVersionDatasource.id];
diff --git a/lib/modules/manager/travis/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/travis/__snapshots__/extract.spec.ts.snap
@@ -5,15 +5,13 @@ exports[`modules/manager/travis/extract extractPackageFile() returns results 1`]
   "deps": [
     {
       "currentValue": "6",
-      "datasource": "github-tags",
+      "datasource": "node-version",
       "depName": "node",
-      "packageName": "nodejs/node",
     },
     {
       "currentValue": "8",
-      "datasource": "github-tags",
+      "datasource": "node-version",
       "depName": "node",
-      "packageName": "nodejs/node",
     },
   ],
 }

diff --git a/lib/modules/manager/travis/extract.spec.ts b/lib/modules/manager/travis/extract.spec.ts
@@ -32,9 +32,8 @@ describe('modules/manager/travis/extract', () => {
         deps: [
           {
             currentValue: '11.10.1',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
-            packageName: 'nodejs/node',
           },
         ],
       });
@@ -46,15 +45,13 @@ describe('modules/manager/travis/extract', () => {
         deps: [
           {
             currentValue: '11.10.1',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
-            packageName: 'nodejs/node',
           },
           {
             currentValue: '11.10.2',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
-            packageName: 'nodejs/node',
           },
         ],
       });
@@ -66,15 +63,13 @@ describe('modules/manager/travis/extract', () => {
         deps: [
           {
             currentValue: '11.10.1',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
-            packageName: 'nodejs/node',
           },
           {
             currentValue: '11.10.2',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
-            packageName: 'nodejs/node',
           },
         ],
       });
@@ -86,9 +81,8 @@ describe('modules/manager/travis/extract', () => {
         deps: [
           {
             currentValue: '11.10.1',
-            datasource: 'github-tags',
+            datasource: 'node-version',
             depName: 'node',
-            packageName: 'nodejs/node',
           },
         ],
       });