feat: install git repositories that use pnpm

.github/workflows/integration-workflow.yml

@@ -214,6 +214,11 @@ jobs:
       with:
         node-version: ${{matrix.node}}.x
 
+    - name: 'Install pnpm'
+      run: |
+        npm i -g pnpm
+      shell: bash
+
     - uses: actions/download-artifact@v2
       with:
         name: yarn-artifacts

.yarn/versions/4d0fa20f.yml

@@ -0,0 +1,33 @@
+releases:
+  "@yarnpkg/cli": minor
+  "@yarnpkg/core": minor
+  "@yarnpkg/plugin-git": minor
+  "@yarnpkg/plugin-github": minor
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-http"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"

CHANGELOG.md

@@ -11,6 +11,7 @@ Yarn now accepts sponsorships! Please give a look at our [OpenCollective](https:
 ### Installs
 
 - The pnpm linker will now remove the `node_modules/.store` and `node_modules` folders if they are empty.
+- Yarn can now install git repositories that use pnpm (workspaces are supported too if pnpm@>=6.x is installed on the system).
 
 ### Miscellaneous Features
 

packages/acceptance-tests/pkg-tests-core/sources/utils/makeTemporaryEnv.ts

@@ -49,7 +49,7 @@ const mte = generatePkgDriver({
         [`YARN_ENABLE_TIMERS`]: `false`,
         [`YARN_ENABLE_PROGRESS_BARS`]: `false`,
         // Otherwise the output wouldn't be the same on CI vs non-CI
-        [`YARN_ENABLE_INLINE_BUILDS`]: `false`,
+        [`YARN_ENABLE_INLINE_BUILDS`]: `true`,
         [`YARN_PREFER_AGGREGATE_CACHE_INFO`]: `false`,
         // Otherwise we would more often test the fallback rather than the real logic
         [`YARN_PNP_FALLBACK_MODE`]: `none`,

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/config

@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/hooks/post-update

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/info/refs

@@ -0,0 +1,3 @@
+57d05601ca0e00e0047b2ea8a0f30b0dc760e40b	refs/heads/master
+57d05601ca0e00e0047b2ea8a0f30b0dc760e40b	refs/remotes/origin/HEAD
+57d05601ca0e00e0047b2ea8a0f30b0dc760e40b	refs/remotes/origin/master

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/objects/04/d06cc440ad490ca4744395bb2c431b70b57898

@@ -0,0 +1 @@
+x
5�1� �agNA:+���ۀv�(4-��b|���/�%h���T�d�!L(�6��s���d�%��3�ؿ�̑�<�CD��Y�,��N&	4�R��
�� �

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/objects/cf/83f8c5aa9f800669eaf31b7b7d3f25f54b3549

@@ -0,0 +1,2 @@
+x
Uͱ�0�ag���$��э�:8��j�
+\��ֻV!�wG���W��V��a�x���c�3�PM�,�^	r��e���Eja�O�;eߦ4��s���Η�v��C7�}"�)fEv&	�yt@�X�;��/'�6�

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/objects/info/packs

@@ -0,0 +1 @@
+

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/packed-refs

@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled sorted 
+57d05601ca0e00e0047b2ea8a0f30b0dc760e40b refs/remotes/origin/master

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-project.git/refs/heads/master

@@ -0,0 +1 @@
+57d05601ca0e00e0047b2ea8a0f30b0dc760e40b

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/config

@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/hooks/post-update

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/info/refs

@@ -0,0 +1,3 @@
+d16bc461ce9bd42690625105cd50ae5936ebce34	refs/heads/master
+d16bc461ce9bd42690625105cd50ae5936ebce34	refs/remotes/origin/HEAD
+d16bc461ce9bd42690625105cd50ae5936ebce34	refs/remotes/origin/master

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/objects/61/3e4f2f72b8aea56b20475c016a6c8fad2485e2

@@ -0,0 +1 @@
+x
�A� =�}
51<�;�b�6���x��L6V�xlKU*Y*�܇h�@n��|� :��0&���鉍[�F��g�J�&�2sm

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/objects/d1/6bc461ce9bd42690625105cd50ae5936ebce34

@@ -0,0 +1,3 @@
+x
��I��V���W��U��6HyQ�1f2f0;̌1��럓��J��k��kQQ�~# p��m�������Ri�}
+��0$Ȕ�a��1E�0f���i̛��T
�i�>���G���_�;,�Q��GH�'Y�p��؇~���6��l(2���É��S6���:�;7��
��sq<B�T�b�y����r��O�ʂ�ٿ�F�H�-�B� >{Y�r|6-���ױz](�i7mGg=��{a�6Ө5*��|�5���F~{@���*x�*���7���
q������F��_.�VtΑm�hk�/J��w��/{�0�Q������]�ﯝ�7"J��(+���..yB�P�NG�Y�+r������1�UENoC��ޙ$i-� �"P��gB�d�2���t�-c���,�i4C)?K ����ɷ�I���J1�j�t���g�+q;���뙐&�,ዾ�Fc���6Ju�(;{W�W��t2Q�\ �Vz��ٰ�^��b1����=6"ϵE�� c`/��+M�9�_]ò�s���m�͝q�D�.��>�C^J5);2��l��U?0��*.��p�r��wb�D��׋"N�%3��}�TB$�Χ�̨��<��n�PCth�
+�~h~e7�zu[s���;%�u`n�/�r�1,}[����!b�-?�ӗ���D�e�e����yd�N˥��%g��+�uZ�%^�bGd���7{�)�;��F������+;#o*���Hb������ƾ;#��5��~�w=�_�O�

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/objects/info/packs

@@ -0,0 +1 @@
+

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/packed-refs

@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled sorted 
+d16bc461ce9bd42690625105cd50ae5936ebce34 refs/remotes/origin/master

packages/acceptance-tests/pkg-tests-fixtures/repositories/pnpm-workspaces.git/refs/heads/master

@@ -0,0 +1 @@
+d16bc461ce9bd42690625105cd50ae5936ebce34

packages/acceptance-tests/pkg-tests-specs/sources/protocols/git.test.js

@@ -185,5 +185,48 @@ describe(`Protocols`, () => {
       ),
       45000,
     );
+
+    test(
+      `it should use pnpm to setup pnpm repositories`,
+      makeTemporaryEnv(
+        {
+          dependencies: {
+            [`pnpm-project`]: startPackageServer().then(url => `${url}/repositories/pnpm-project.git`),
+          },
+        },
+        async ({path, run, source}) => {
+          await run(`install`);
+
+          await expect(source(`require('pnpm-project')`)).resolves.toMatch(/\bpnpm\/[0-9]+/);
+        },
+      ),
+      45000,
+    );
+
+    test(
+      `it should support installing specific workspaces from pnpm repositories`,
+      makeTemporaryEnv(
+        {
+          dependencies: {
+            [`pkg-a`]: startPackageServer().then(url => `${url}/repositories/pnpm-workspaces.git#workspace=pkg-a`),
+            [`pkg-b`]: startPackageServer().then(url => `${url}/repositories/pnpm-workspaces.git#workspace=pkg-b`),
+          },
+        },
+        async ({path, run, source}) => {
+          await run(`install`);
+
+          await expect(source(`require('pkg-a/package.json')`)).resolves.toMatchObject({
+            name: `pkg-a`,
+            version: `1.0.0`,
+          });
+
+          await expect(source(`require('pkg-b/package.json')`)).resolves.toMatchObject({
+            name: `pkg-b`,
+            version: `1.0.0`,
+          });
+        },
+      ),
+      45000,
+    );
   });
 });

packages/gatsby/content/features/protocols.md

@@ -52,7 +52,7 @@ [email protected]:yarnpkg/berry.git#head=master
 
 - Yarn will use either of Yarn, npm, or pnpm to pack the repository, based on the repository style (ie we'll use Yarn if there's a `yarn.lock`, npm if there's a `package-lock.json`, or pnpm if there's a `pnpm-lock.yaml`)
 
-- Workspaces can be cloned as long as the remote repository uses Yarn or npm (npm@>=7.x has to be installed on the system); we can't support pnpm because it doesn't have equivalent for the [`workspace` command](/cli/workspace). Just reference the workspace by name in your range (you can optionally enforce the tag as well):
+- Workspaces can be cloned as long as the remote repository uses Yarn, npm (npm@>=7.x has to be installed on the system), or pnpm (pnpm@>=6.x has to be installed on the system). Just reference the workspace by name in your range (you can optionally enforce the tag as well):
 
 ```
 [email protected]:yarnpkg/berry.git#workspace=@yarnpkg/shell&tag=@yarnpkg/shell/2.1.0

packages/yarnpkg-core/sources/scriptUtils.ts

@@ -348,11 +348,44 @@ export async function prepareExternalProject(cwd: PortablePath, outputPath: Port
 
             return 0;
           }],
+
+          [PackageManager.Pnpm, async () => {
+            const install = await execUtils.pipevp(`pnpm`, [`install`], {cwd, env, stdin, stdout, stderr, end: execUtils.EndStrategy.ErrorCode});
+            if (install.code !== 0)
+              return install.code;
+
+            const packStream = new PassThrough();
+            const packPromise = miscUtils.bufferStream(packStream);
+
+            packStream.pipe(stdout);
+
+            // It seems that pnpm doesn't support specifying the pack output path,
+            // so we have to extract the stdout on top of forking it to the logs.
+
+            // - `pnpm pack` doesn't support the `--filter` flag so we have to use `pnpm exec`
+            // - We have to use the `--pack-destination` flag because otherwise pnpm generates the tarball inside the workspace cwd
+            // - Only pnpm@>=6.x supports the `--pack-destination` flag (and previous versions throw an error)
+            const packArgs = workspace !== null
+              ? [`--filter`, workspace, `exec`, `pnpm`, `pack`, `--pack-destination`, npath.fromPortablePath(cwd)]
+              : [`pack`];
+
+            const pack = await execUtils.pipevp(`pnpm`, packArgs, {cwd, env, stdin, stdout: packStream, stderr});
+            if (pack.code !== 0)
+              return pack.code;
+
+            const packOutput = (await packPromise).toString().trim().replace(/^.*\n/s, ``);
+            const packTarget = ppath.resolve(cwd, npath.toPortablePath(packOutput));
+
+            // Only then can we move the pack to its rightful location
+            await xfs.renamePromise(packTarget, outputPath);
+
+            return 0;
+          }],
         ]);
 
         const workflow = workflows.get(effectivePackageManager);
         if (typeof workflow === `undefined`)
-          throw new Error(`Assertion failed: Unsupported workflow`);
+          throw new Error(`Assertion failed: Unsupported workflow: "${effectivePackageManager}"`);
 
         const code = await workflow();
         if (code === 0 || typeof code === `undefined`)