Merge pull request #288 from snyk/lockfile_parser_return_valid_name

fix: move to the new version of nodejs-lockfile-parser
snyk · Dec 5, 2018 · e0b524d · e0b524d
2 parents 581caec + 0387444
commit e0b524d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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() {