From 0387444d51b895f1c11b31f0d8a3511856c6a30f Mon Sep 17 00:00:00 2001 From: Yulia Bar-On Date: Wed, 5 Dec 2018 15:04:53 +0200 Subject: [PATCH] fix: when "name" property is missing in package.json use path as a project name --- package.json | 2 +- src/lib/plugins/npm/index.js | 5 +++-- src/lib/plugins/yarn/index.js | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f00a041d0d..2615ae7302 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "snyk-gradle-plugin": "2.1.1", "snyk-module": "1.9.1", "snyk-mvn-plugin": "2.0.0", - "snyk-nodejs-lockfile-parser": "1.8.0", + "snyk-nodejs-lockfile-parser": "1.9.0", "snyk-nuget-plugin": "1.6.5", "snyk-php-plugin": "1.5.1", "snyk-policy": "1.13.1", diff --git a/src/lib/plugins/npm/index.js b/src/lib/plugins/npm/index.js index 7685a282b2..7a5c3aa4d0 100644 --- a/src/lib/plugins/npm/index.js +++ b/src/lib/plugins/npm/index.js @@ -60,8 +60,9 @@ async function generateDependenciesFromLockfile(root, options, targetFile) { const manifestFile = await fs.readFile(manifestFileFullPath, 'utf-8'); const lockFile = await fs.readFile(lockFileFullPath, 'utf-8'); + const defaultManifestFileName = path.relative(root, manifestFileFullPath); - return lockFileParser - .buildDepTree(manifestFile, lockFile, options.dev, lockFileParser.LockfileType.npm); + return lockFileParser.buildDepTree(manifestFile, lockFile, options.dev, + lockFileParser.LockfileType.npm, true, defaultManifestFileName); } diff --git a/src/lib/plugins/yarn/index.js b/src/lib/plugins/yarn/index.js index 67937c81c0..2bfd0fbd4d 100644 --- a/src/lib/plugins/yarn/index.js +++ b/src/lib/plugins/yarn/index.js @@ -74,9 +74,10 @@ async function generateDependenciesFromLockfile(root, options, targetFile) { const manifestFile = await fs.readFile(manifestFileFullPath, 'utf-8'); const lockFile = await fs.readFile(lockFileFullPath, 'utf-8'); + const defaultManifestFileName = path.relative(root, manifestFileFullPath); - return lockFileParser - .buildDepTree(manifestFile, lockFile, options.dev, lockFileParser.LockfileType.yarn); + return lockFileParser.buildDepTree(manifestFile, lockFile, options.dev, + lockFileParser.LockfileType.yarn, true, defaultManifestFileName); } function getRuntimeVersion() {