Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/fuzzy-zebras-lose.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nodesecure/scanner": minor
"@nodesecure/rc": minor
---

Update vulnera to v3.x.x
2 changes: 1 addition & 1 deletion workspaces/rc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"dependencies": {
"@nodesecure/js-x-ray": "14.0.0",
"@nodesecure/npm-types": "^1.2.0",
"@nodesecure/vulnera": "^2.0.1",
"@nodesecure/vulnera": "3.0.0",
"@openally/config": "^1.0.1",
"@openally/result": "2.0.0",
"lodash.merge": "^4.6.2",
Expand Down
2 changes: 1 addition & 1 deletion workspaces/scanner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@nodesecure/tarball": "^3.5.0",
"@nodesecure/tree-walker": "^2.5.0",
"@nodesecure/utils": "^2.3.0",
"@nodesecure/vulnera": "^2.0.1",
"@nodesecure/vulnera": "3.0.0",
"@openally/mutex": "^2.0.0",
"fastest-levenshtein": "^1.0.16",
"frequency-set": "^2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions workspaces/scanner/src/comparePayloads.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Import Third-party Dependencies
import type { Warning } from "@nodesecure/js-x-ray";
import * as Vulnera from "@nodesecure/vulnera";
import type { StandardVulnerability } from "@nodesecure/vulnera";

// Import Internal Dependencies
import type {
Expand Down Expand Up @@ -33,7 +33,7 @@ export interface DependencyComparison {
publishers: ArrayDiff<Publisher>;
maintainers: ArrayDiff<Maintainer>;
versions: VersionsComparisonResult;
vulnerabilities: ArrayDiff<Vulnera.StandardVulnerability>;
vulnerabilities: ArrayDiff<StandardVulnerability>;
}

export interface VersionsComparisonResult {
Expand Down
4 changes: 2 additions & 2 deletions workspaces/scanner/src/depWalker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ export async function depWalker(
const isVulnHydratable = (strategy === "github-advisory" || strategy === "snyk")
&& isRemoteScanning;
if (!isVulnHydratable) {
await hydratePayloadDependencies(dependencies as any, {
useStandardFormat: true,
await hydratePayloadDependencies(dependencies, {
useFormat: "Standard",
path: location
});
}
Expand Down
8 changes: 4 additions & 4 deletions workspaces/scanner/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Import Third-party Dependencies
import type { Warning } from "@nodesecure/js-x-ray";
import * as Vulnera from "@nodesecure/vulnera";
import type { StandardVulnerability, Kind } from "@nodesecure/vulnera";
import type { PackageModuleType } from "@nodesecure/mama";

import type { SpdxFileLicenseConformance } from "@nodesecure/conformance";
Expand Down Expand Up @@ -153,7 +153,7 @@ export interface Dependency {
*
* @see https://github.com/NodeSecure/vuln
*/
vulnerabilities: Vulnera.StandardVulnerability[];
vulnerabilities: StandardVulnerability[];
}

export type Dependencies = Record<string, Dependency>;
Expand Down Expand Up @@ -265,7 +265,7 @@ export interface Payload {
/** Version of the scanner used to generate the result */
scannerVersion: string;
/** Vulnerability strategy name (npm, snyk, node) */
vulnerabilityStrategy: Vulnera.Kind;
vulnerabilityStrategy: Kind;

metadata: Stats;
}
Expand Down Expand Up @@ -325,7 +325,7 @@ export interface Options {
*
* @default NONE
*/
readonly vulnerabilityStrategy?: Vulnera.Kind;
readonly vulnerabilityStrategy?: Kind;

/**
* Analyze root package.
Expand Down
Loading