fix: bin file name for pnpm >=6.0 (#35)

* fix: bin file name for pnpm >=6.0 * Adds test * Adds nock entry Co-authored-by: Maël Nison <nison.mael@gmail.com>
nodejs · May 31, 2021 · 8ff2499 · 8ff2499
1 parent ee2d45d
commit 8ff2499
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 2 deletions.
diff --git a/config.json b/config.json
@@ -31,7 +31,7 @@
               ]
             },
             "ranges": {
-                "*": {
+                "<6.0.0": {
                     "url": "https://registry.npmjs.org/pnpm/-/pnpm-{}.tgz",
                     "bin": {
                         "pnpm": "./bin/pnpm.js",
@@ -41,6 +41,17 @@
                         "type": "npm",
                         "package": "pnpm"
                     }
+                },
+                ">=6.0.0": {
+                    "url": "https://registry.npmjs.org/pnpm/-/pnpm-{}.tgz",
+                    "bin": {
+                        "pnpm": "./bin/pnpm.cjs",
+                        "pnpx": "./bin/pnpx.cjs"
+                    },
+                    "tags": {
+                        "type": "npm",
+                        "package": "pnpm"
+                    }
                 }
             }
         },

diff --git a/tests/main.test.ts b/tests/main.test.ts
@@ -8,7 +8,16 @@ beforeEach(async () => {
   process.env.COREPACK_HOME = npath.fromPortablePath(await xfs.mktempPromise());
 });
 
-for (const [name, version] of [[`yarn`, `1.22.4`], [`yarn`, `2.0.0-rc.30`], [`yarn`, `3.0.0-rc.2`], [`pnpm`, `4.11.6`], [`npm`, `6.14.2`]]) {
+const testedPackageManagers: [string, string][] = [
+  [`yarn`, `1.22.4`],
+  [`yarn`, `2.0.0-rc.30`],
+  [`yarn`, `3.0.0-rc.2`],
+  [`pnpm`, `4.11.6`],
+  [`pnpm`, `6.6.2`],
+  [`npm`, `6.14.2`],
+];
+
+for (const [name, version] of testedPackageManagers) {
   it(`should use the right package manager version for a given project (${name}@${version})`, async () => {
     await xfs.mktempPromise(async cwd => {
       await xfs.writeJsonPromise(ppath.join(cwd, `package.json` as Filename), {

diff --git a/tests/nock/2b6ea0b916d81bdbd9610c20154e651e.dat b/tests/nock/2b6ea0b916d81bdbd9610c20154e651e.dat
diff --git a/tests/nock/31547e0cfc442fb8d013d69eb40efdd5.dat b/tests/nock/31547e0cfc442fb8d013d69eb40efdd5.dat
diff --git a/tests/nock/33cd8454d05733cc85927ead3827e530.dat b/tests/nock/33cd8454d05733cc85927ead3827e530.dat
diff --git a/tests/nock/56d313acc6b3c9facc9880412df746cc.dat b/tests/nock/56d313acc6b3c9facc9880412df746cc.dat
diff --git a/tests/nock/726d31626ab89c98bcf7a4fdd9e56c2c.dat b/tests/nock/726d31626ab89c98bcf7a4fdd9e56c2c.dat
diff --git a/tests/nock/803df9e3e921c591cdf0824fadeea2ab.dat b/tests/nock/803df9e3e921c591cdf0824fadeea2ab.dat
diff --git a/tests/nock/954dd4b8cba8adecfd4338925211a0f2.dat b/tests/nock/954dd4b8cba8adecfd4338925211a0f2.dat
diff --git a/tests/nock/b6b52de887cdae78fcc91926b018cd8f.dat b/tests/nock/b6b52de887cdae78fcc91926b018cd8f.dat
diff --git a/tests/nock/cc8a8d48e90ac9d95b6720b8be9165ba.dat b/tests/nock/cc8a8d48e90ac9d95b6720b8be9165ba.dat
diff --git a/tests/nock/cef51e93f92c7c41705919c0254b8e17.dat b/tests/nock/cef51e93f92c7c41705919c0254b8e17.dat
diff --git a/tests/nock/d95b9c8791279b33c455e9750d661f3d.dat b/tests/nock/d95b9c8791279b33c455e9750d661f3d.dat
diff --git a/tests/nock/da2b6ea88217b10514e65d926523110d.dat b/tests/nock/da2b6ea88217b10514e65d926523110d.dat
diff --git a/tests/nock/e087e0c28c4d479255e5b0688d2dba2a.dat b/tests/nock/e087e0c28c4d479255e5b0688d2dba2a.dat
diff --git a/tests/nock/eff64a4911c6ece7e446f3c91d8a716d.dat b/tests/nock/eff64a4911c6ece7e446f3c91d8a716d.dat
diff --git a/tests/nock/fdbda9c68c89e4c0d0a7090f6689e6be.dat b/tests/nock/fdbda9c68c89e4c0d0a7090f6689e6be.dat