From 95ce900e7078fdfe46ec8483ce5c983399b8d814 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 16 Mar 2021 19:25:03 +0100
Subject: [PATCH] refactor: npmId
---
lib/manager/meteor/extract.ts | 4 ++--
lib/manager/npm/extract/index.ts | 12 ++++++------
lib/workers/repository/init/vulnerability.ts | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/manager/meteor/extract.ts b/lib/manager/meteor/extract.ts
index 9a557c4eb8..651827aa92 100644
--- a/lib/manager/meteor/extract.ts
+++ b/lib/manager/meteor/extract.ts
@@ -1,4 +1,4 @@
-import * as datasourceNpm from '../../datasource/npm';
+import { id as npmId } from '../../datasource/npm';
import { logger } from '../../logger';
import type { PackageDependency, PackageFile } from '../types';
@@ -24,7 +24,7 @@ export function extractPackageFile(content: string): PackageFile | null {
return {
depName,
currentValue,
- datasource: datasourceNpm.id,
+ datasource: npmId,
};
})
.filter((dep) => dep.depName && dep.currentValue);
diff --git a/lib/manager/npm/extract/index.ts b/lib/manager/npm/extract/index.ts
index 3b6893eedc..bd5d442b65 100644
--- a/lib/manager/npm/extract/index.ts
+++ b/lib/manager/npm/extract/index.ts
@@ -4,7 +4,7 @@ import validateNpmPackageName from 'validate-npm-package-name';
import { getAdminConfig } from '../../../config/admin';
import { CONFIG_VALIDATION } from '../../../constants/error-messages';
import * as datasourceGithubTags from '../../../datasource/github-tags';
-import * as datasourceNpm from '../../../datasource/npm';
+import { id as npmId } from '../../../datasource/npm';
import { logger } from '../../../logger';
import { SkipReason } from '../../../types';
import {
@@ -180,15 +180,15 @@ export async function extractPackageFile(
dep.versioning = nodeVersioning.id;
constraints.node = dep.currentValue;
} else if (depName === 'yarn') {
- dep.datasource = datasourceNpm.id;
+ dep.datasource = npmId;
dep.commitMessageTopic = 'Yarn';
constraints.yarn = dep.currentValue;
} else if (depName === 'npm') {
- dep.datasource = datasourceNpm.id;
+ dep.datasource = npmId;
dep.commitMessageTopic = 'npm';
constraints.npm = dep.currentValue;
} else if (depName === 'pnpm') {
- dep.datasource = datasourceNpm.id;
+ dep.datasource = npmId;
dep.commitMessageTopic = 'pnpm';
constraints.pnpm = dep.currentValue;
} else if (depName === 'vscode') {
@@ -211,7 +211,7 @@ export async function extractPackageFile(
dep.lookupName = 'nodejs/node';
dep.versioning = nodeVersioning.id;
} else if (depName === 'yarn') {
- dep.datasource = datasourceNpm.id;
+ dep.datasource = npmId;
dep.commitMessageTopic = 'Yarn';
} else {
dep.skipReason = SkipReason.UnknownVolta;
@@ -241,7 +241,7 @@ export async function extractPackageFile(
return dep;
}
if (isValid(dep.currentValue)) {
- dep.datasource = datasourceNpm.id;
+ dep.datasource = npmId;
if (dep.currentValue === '*') {
dep.skipReason = SkipReason.AnyVersion;
}
diff --git a/lib/workers/repository/init/vulnerability.ts b/lib/workers/repository/init/vulnerability.ts
index 30f97da2b0..c4e5940d1f 100644
--- a/lib/workers/repository/init/vulnerability.ts
+++ b/lib/workers/repository/init/vulnerability.ts
@@ -1,7 +1,7 @@
import { PackageRule, RenovateConfig } from '../../../config';
import { NO_VULNERABILITY_ALERTS } from '../../../constants/error-messages';
import * as datasourceMaven from '../../../datasource/maven';
-import * as datasourceNpm from '../../../datasource/npm';
+import { id as npmId } from '../../../datasource/npm';
import * as datasourceNuget from '../../../datasource/nuget';
import * as datasourcePypi from '../../../datasource/pypi';
import * as datasourceRubygems from '../../../datasource/rubygems';
@@ -80,7 +80,7 @@ export async function detectVulnerabilityAlerts(
}
const datasourceMapping: Record<string, string> = {
MAVEN: datasourceMaven.id,
- NPM: datasourceNpm.id,
+ NPM: npmId,
NUGET: datasourceNuget.id,
PIP: datasourcePypi.id,
RUBYGEMS: datasourceRubygems.id,
--
GitLab