feat: prepare for yarn v2 feature

snyk · Apr 28, 2020 · 8ecfe48 · 8ecfe48
1 parent fb0f1dd
commit 8ecfe48
Show file tree

Hide file tree

Showing 42 changed files with 4 additions and 39,886 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,3 @@ dist
 .eslintcache
 *.log
 /package-lock.json
-.idea
diff --git a/lib/index.ts b/lib/index.ts
@@ -14,7 +14,6 @@ import {
 } from './parsers';
 import { PackageLockParser } from './parsers/package-lock-parser';
 import { YarnLockParser } from './parsers/yarn-lock-parse';
-import { Yarn2LockParser } from './parsers/yarn2-lock-parse';
 import getRuntimeVersion from './get-node-runtime-version';
 import {
   UnsupportedRuntimeError,
@@ -64,18 +63,6 @@ async function buildDepTree(
         );
       }
       break;
-    case LockfileType.yarn2:
-      // parsing yarn.lock is supported for Node.js v10 and higher
-      if (getRuntimeVersion() >= 10) {
-        lockfileParser = new Yarn2LockParser();
-      } else {
-        throw new UnsupportedRuntimeError(
-          'Parsing `yarn.lock` is not ' +
-            'supported on Node.js version less than 10. Please upgrade your ' +
-            'Node.js environment or use `package-lock.json`',
-        );
-      }
-      break;
     default:
       throw new InvalidUserInputError(
         'Unsupported lockfile type ' +
@@ -113,15 +100,7 @@ async function buildDepTreeFromFiles(
   if (_.endsWith(lockFilePath, 'package-lock.json')) {
     lockFileType = LockfileType.npm;
   } else if (_.endsWith(lockFilePath, 'yarn.lock')) {
-    if (
-      fs.existsSync(
-        path.resolve(root, lockFilePath.replace('yarn.lock', '.yarnrc.yml')),
-      )
-    ) {
-      lockFileType = LockfileType.yarn2;
-    } else {
-      lockFileType = LockfileType.yarn;
-    }
+    lockFileType = LockfileType.yarn;
   } else {
     throw new InvalidUserInputError(
       `Unknown lockfile ${lockFilePath}. ` +

diff --git a/lib/parsers/index.ts b/lib/parsers/index.ts
@@ -2,7 +2,6 @@ import * as _ from 'lodash';
 import { PackageLock } from './package-lock-parser';
 import { YarnLock } from './yarn-lock-parse';
 import { InvalidUserInputError } from '../errors';
-import { Yarn2Lock } from './yarn2-lock-parse';
 
 export interface Dep {
   name: string;
@@ -65,7 +64,6 @@ export enum Scope {
 export enum LockfileType {
   npm = 'npm',
   yarn = 'yarn',
-  yarn2 = 'yarn2',
 }
 
 export interface LockfileParser {
@@ -78,7 +76,7 @@ export interface LockfileParser {
   ) => Promise<PkgTree>;
 }
 
-export type Lockfile = PackageLock | YarnLock | Yarn2Lock;
+export type Lockfile = PackageLock | YarnLock;
 
 export function parseManifestFile(manifestFileContents: string): ManifestFile {
   try {

diff --git a/lib/parsers/yarn-lock-parse-base.ts b/lib/parsers/yarn-lock-parse-base.ts
@@ -22,7 +22,7 @@ import { config } from '../config';
 
 const EVENT_PROCESSING_CONCURRENCY = 5;
 
-export type YarnLockFileTypes = LockfileType.yarn | LockfileType.yarn2;
+export type YarnLockFileTypes = LockfileType.yarn;
 
 export interface YarnLockDeps {
   [depName: string]: YarnLockDep;

diff --git a/lib/parsers/yarn-utils.ts b/lib/parsers/yarn-utils.ts
diff --git a/lib/parsers/yarn2-lock-parse.ts b/lib/parsers/yarn2-lock-parse.ts
diff --git a/package.json b/package.json
@@ -30,7 +30,6 @@
   ],
   "homepage": "https://github.com/snyk/nodejs-lockfile-parser#readme",
   "dependencies": {
-    "@yarnpkg/core": "^2.0.0-rc.26",
     "@yarnpkg/lockfile": "^1.0.2",
     "event-loop-spinner": "^1.1.0",
     "graphlib": "^2.1.5",
@@ -39,8 +38,7 @@
     "snyk-config": "^3.0.0",
     "source-map-support": "^0.5.7",
     "tslib": "^1.9.3",
-    "uuid": "^3.3.2",
-    "yaml": "^1.9.2"
+    "uuid": "^3.3.2"
   },
   "devDependencies": {
     "@types/graphlib": "^2.1.4",

diff --git a/test/lib/fixtures/cyclic-dep-simple/yarn2/.yarnrc.yml b/test/lib/fixtures/cyclic-dep-simple/yarn2/.yarnrc.yml
diff --git a/test/lib/fixtures/cyclic-dep-simple/yarn2/yarn.lock b/test/lib/fixtures/cyclic-dep-simple/yarn2/yarn.lock
diff --git a/test/lib/fixtures/dev-deps-only/yarn2/.yarnrc.yml b/test/lib/fixtures/dev-deps-only/yarn2/.yarnrc.yml
diff --git a/test/lib/fixtures/dev-deps-only/yarn2/yarn.lock b/test/lib/fixtures/dev-deps-only/yarn2/yarn.lock
diff --git a/test/lib/fixtures/empty-dev-deps/yarn2/.yarnrc.yml b/test/lib/fixtures/empty-dev-deps/yarn2/.yarnrc.yml
diff --git a/test/lib/fixtures/empty-dev-deps/yarn2/yarn.lock b/test/lib/fixtures/empty-dev-deps/yarn2/yarn.lock
diff --git a/test/lib/fixtures/external-tarball/yarn2/.yarnrc.yml b/test/lib/fixtures/external-tarball/yarn2/.yarnrc.yml