From d11ca8f96b5d99d2619494d1c38f3e0a51ec6103 Mon Sep 17 00:00:00 2001
From: zoomdong <1344492820@qq.com>
Date: Wed, 24 Nov 2021 00:25:47 +0800
Subject: [PATCH] chore: adjust code owners

---
 .changeset/khaki-wolves-admire.md                            | 5 +++++
 .github/CODEOWNERS                                           | 1 +
 .../src/{import.ts => import/index.ts}                       | 4 ++--
 .../src/{ => import}/yarnUtil.ts                             | 0
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/khaki-wolves-admire.md
 rename packages/plugin-commands-installation/src/{import.ts => import/index.ts} (98%)
 rename packages/plugin-commands-installation/src/{ => import}/yarnUtil.ts (100%)

diff --git a/.changeset/khaki-wolves-admire.md b/.changeset/khaki-wolves-admire.md
new file mode 100644
index 00000000000..8f610d5ab19
--- /dev/null
+++ b/.changeset/khaki-wolves-admire.md
@@ -0,0 +1,5 @@
+---
+"@pnpm/plugin-commands-installation": minor
+---
+
+feat: support yarn v2 lockfile transform
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c73c8b44b23..9476c22ec8f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,2 @@
 * @zkochan
+/packages/plugin-commands-installation/src/import/* @fireairforce
diff --git a/packages/plugin-commands-installation/src/import.ts b/packages/plugin-commands-installation/src/import/index.ts
similarity index 98%
rename from packages/plugin-commands-installation/src/import.ts
rename to packages/plugin-commands-installation/src/import/index.ts
index 0d290912892..82b73018b05 100644
--- a/packages/plugin-commands-installation/src/import.ts
+++ b/packages/plugin-commands-installation/src/import/index.ts
@@ -21,7 +21,7 @@ import { parse as parseYarnLock } from '@yarnpkg/lockfile'
 import * as yarnCore from '@yarnpkg/core'
 import { parseSyml } from '@yarnpkg/parsers'
 import exists from 'path-exists'
-import recursive from './recursive'
+import recursive from '../recursive'
 import { yarnLockFileKeyNormalizer } from './yarnUtil'
 
 interface NpmPackageLock {
@@ -163,7 +163,7 @@ async function readYarnLockFile (dir: string) {
       if (lockJsonFile.type === 'success') {
         return lockJsonFile.object
       } else {
-        throw new PnpmError('GET_YARN_LOCKFILE_ERR', `Failed With ${lockJsonFile.type}`)
+        throw new PnpmError('YARN_LOCKFILE_PARSE_FAILED', `Yarn.lock file was ${lockJsonFile.type}`)
       }
     } else if (yarnLockFileType === YarnLockType.yarn2) {
       lockJsonFile = parseYarn2Lock(yarnLockFile)
diff --git a/packages/plugin-commands-installation/src/yarnUtil.ts b/packages/plugin-commands-installation/src/import/yarnUtil.ts
similarity index 100%
rename from packages/plugin-commands-installation/src/yarnUtil.ts
rename to packages/plugin-commands-installation/src/import/yarnUtil.ts